diff --git a/test/e2e/framework/exec.go b/test/e2e/framework/exec.go index 8d528c37a..fe1e753fe 100644 --- a/test/e2e/framework/exec.go +++ b/test/e2e/framework/exec.go @@ -32,7 +32,7 @@ import ( // GetLbAlgorithm returns algorithm identifier for the given backend 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) output, err := f.ExecIngressPod(cmd) diff --git a/test/e2e/settings/default_ssl_certificate.go b/test/e2e/settings/default_ssl_certificate.go index c48a1e87f..698fd1d87 100644 --- a/test/e2e/settings/default_ssl_certificate.go +++ b/test/e2e/settings/default_ssl_certificate.go @@ -68,7 +68,7 @@ var _ = framework.IngressNginxDescribe("[SSL] [Flag] default-ssl-certificate", f f.EnsureIngress(ing) 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 { return strings.Contains(cfg, expectedConfig) }) @@ -90,7 +90,7 @@ var _ = framework.IngressNginxDescribe("[SSL] [Flag] default-ssl-certificate", f assert.Nil(ginkgo.GinkgoT(), err) 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 { return strings.Contains(cfg, expectedConfig) }) diff --git a/test/e2e/tcpudp/tcp.go b/test/e2e/tcpudp/tcp.go index 856184d18..d959dc152 100644 --- a/test/e2e/tcpudp/tcp.go +++ b/test/e2e/tcpudp/tcp.go @@ -66,7 +66,7 @@ var _ = framework.IngressNginxDescribe("[TCP] tcp-services", func() { f.WaitForNginxConfiguration( 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)) })