DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix e2e

Browse source
This commit is contained in:
Revolution1 2024-09-07 11:41:36 +08:00
parent c05f106f38
commit 743c45b04d
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/e2e/annotations/canary.go
View file

@ -1091,8 +1091,8 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
f.WaitForNginxServer("_", f.WaitForNginxServer("_",
func(server string) bool { func(server string) bool {
upstreamName := fmt.Sprintf(`set $proxy_upstream_name "%s-%s-%s";`, f.Namespace, framework.HTTPBunService, "80") upstreamName := fmt.Sprintf(`set $proxy_upstream_name "%s_%s_%s";`, f.Namespace, framework.HTTPBunService, "80")
canaryUpstreamName := fmt.Sprintf(`set $proxy_upstream_name "%s-%s-%s";`, f.Namespace, canaryService, "80") canaryUpstreamName := fmt.Sprintf(`set $proxy_upstream_name "%s_%s_%s";`, f.Namespace, canaryService, "80")
return strings.Contains(server, fmt.Sprintf(`set $ingress_name "%v";`, host)) && return strings.Contains(server, fmt.Sprintf(`set $ingress_name "%v";`, host)) &&
!strings.Contains(server, `set $proxy_upstream_name "upstream-default-backend";`) && !strings.Contains(server, `set $proxy_upstream_name "upstream-default-backend";`) &&

4
test/e2e/settings/proxy_host.go
View file

@ -37,7 +37,7 @@ var _ = framework.IngressNginxDescribe("Dynamic $proxy_host", func() {
disableSnippet := f.AllowSnippetConfiguration() disableSnippet := f.AllowSnippetConfiguration()
defer disableSnippet() defer disableSnippet()
upstreamName := fmt.Sprintf("%v-%v-80", f.Namespace, framework.EchoService) upstreamName := fmt.Sprintf("%v_%v_80", f.Namespace, framework.EchoService)
annotations := map[string]string{ annotations := map[string]string{
"nginx.ingress.kubernetes.io/configuration-snippet": `more_set_headers "Custom-Header: $proxy_host"`, "nginx.ingress.kubernetes.io/configuration-snippet": `more_set_headers "Custom-Header: $proxy_host"`,
} }
@ -61,7 +61,7 @@ var _ = framework.IngressNginxDescribe("Dynamic $proxy_host", func() {
disableSnippet := f.AllowSnippetConfiguration() disableSnippet := f.AllowSnippetConfiguration()
defer disableSnippet() defer disableSnippet()
upstreamName := fmt.Sprintf("%v-%v-80", f.Namespace, framework.EchoService) upstreamName := fmt.Sprintf("%v_%v_80", f.Namespace, framework.EchoService)
upstreamVHost := "different.host" upstreamVHost := "different.host"
annotations := map[string]string{ annotations := map[string]string{
"nginx.ingress.kubernetes.io/upstream-vhost": upstreamVHost, "nginx.ingress.kubernetes.io/upstream-vhost": upstreamVHost,