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 12:23:47 +08:00
parent 743c45b04d
commit 5d3d9f5778
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/e2e/framework/exec.go
View file

@ -32,7 +32,7 @@ import (
// GetLbAlgorithm returns algorithm identifier for the given backend // GetLbAlgorithm returns algorithm identifier for the given backend
func (f *Framework) GetLbAlgorithm(serviceName string, servicePort int) (string, error) { func (f *Framework) GetLbAlgorithm(serviceName string, servicePort int) (string, error) {
backendName := fmt.Sprintf("%s-%s-%v", f.Namespace, serviceName, servicePort) backendName := fmt.Sprintf("%s_%s_%v", f.Namespace, serviceName, servicePort)
cmd := fmt.Sprintf("/dbg backends get %s", backendName) cmd := fmt.Sprintf("/dbg backends get %s", backendName)
output, err := f.ExecIngressPod(cmd) output, err := f.ExecIngressPod(cmd)

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

@ -68,7 +68,7 @@ var _ = framework.IngressNginxDescribe("[SSL] [Flag] default-ssl-certificate", f
f.EnsureIngress(ing) f.EnsureIngress(ing)
ginkgo.By("making sure new ingress is deployed") ginkgo.By("making sure new ingress is deployed")
expectedConfig := fmt.Sprintf(`set $proxy_upstream_name "%v-%v-%v";`, f.Namespace, service, port) expectedConfig := fmt.Sprintf(`set $proxy_upstream_name "%v_%v_%v";`, f.Namespace, service, port)
f.WaitForNginxServer("_", func(cfg string) bool { f.WaitForNginxServer("_", func(cfg string) bool {
return strings.Contains(cfg, expectedConfig) return strings.Contains(cfg, expectedConfig)
}) })
@ -90,7 +90,7 @@ var _ = framework.IngressNginxDescribe("[SSL] [Flag] default-ssl-certificate", f
assert.Nil(ginkgo.GinkgoT(), err) assert.Nil(ginkgo.GinkgoT(), err)
ginkgo.By("making sure new ingress is deployed") ginkgo.By("making sure new ingress is deployed")
expectedConfig := fmt.Sprintf(`set $proxy_upstream_name "%v-%v-%v";`, f.Namespace, service, port) expectedConfig := fmt.Sprintf(`set $proxy_upstream_name "%v_%v_%v";`, f.Namespace, service, port)
f.WaitForNginxServer(host, func(cfg string) bool { f.WaitForNginxServer(host, func(cfg string) bool {
return strings.Contains(cfg, expectedConfig) return strings.Contains(cfg, expectedConfig)
}) })

2
test/e2e/tcpudp/tcp.go
View file

@ -66,7 +66,7 @@ var _ = framework.IngressNginxDescribe("[TCP] tcp-services", func() {
f.WaitForNginxConfiguration( f.WaitForNginxConfiguration(
func(cfg string) bool { func(cfg string) bool {
return strings.Contains(cfg, fmt.Sprintf(`ngx.var.proxy_upstream_name="tcp-%v-%v-80"`, return strings.Contains(cfg, fmt.Sprintf(`ngx.var.proxy_upstream_name="tcp-%v_%v_80"`,
f.Namespace, framework.EchoService)) f.Namespace, framework.EchoService))
}) })