Merge pull request #5709 from agile6v/master

fix: remove duplicated X-Forwarded-Proto header.
This commit is contained in:
Kubernetes Prow Robot 2020-07-02 17:50:47 -07:00 committed by GitHub
commit baa2b2cd33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions

View file

@ -47,7 +47,8 @@ var _ = framework.DescribeSetting("use-forwarded-headers", func() {
f.WaitForNginxServer(host,
func(server string) bool {
return strings.Contains(server, "server_name forwarded-headers")
return strings.Contains(server, "server_name forwarded-headers") &&
strings.Contains(server, "proxy_set_header X-Forwarded-Proto $full_x_forwarded_proto;")
})
ginkgo.By("ensuring single values are parsed correctly")
@ -95,7 +96,8 @@ var _ = framework.DescribeSetting("use-forwarded-headers", func() {
f.WaitForNginxServer(host,
func(server string) bool {
return strings.Contains(server, "server_name forwarded-headers")
return strings.Contains(server, "server_name forwarded-headers") &&
strings.Contains(server, "proxy_set_header X-Forwarded-Proto $pass_access_scheme;")
})
body := f.HTTPTestClient().