From fdd445cb2a4b01c91ac577143518cba6dad80651 Mon Sep 17 00:00:00 2001 From: Alex Kursell Date: Tue, 12 Mar 2019 12:46:56 -0400 Subject: [PATCH] Fix e2e-tests --- test/e2e/annotations/xforwardedprefix.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/e2e/annotations/xforwardedprefix.go b/test/e2e/annotations/xforwardedprefix.go index 908630bfc..479aa4de0 100644 --- a/test/e2e/annotations/xforwardedprefix.go +++ b/test/e2e/annotations/xforwardedprefix.go @@ -41,7 +41,7 @@ var _ = framework.IngressNginxDescribe("Annotations - X-Forwarded-Prefix", func( "nginx.ingress.kubernetes.io/rewrite-target": "/foo", } - f.EnsureIngress(framework.NewSingleIngress(host, "/", host, f.IngressController.Namespace, "http-svc", 80, &annotations)) + f.EnsureIngress(framework.NewSingleIngress(host, "/", host, f.Namespace, "http-svc", 80, &annotations)) f.WaitForNginxServer(host, func(server string) bool { return Expect(server).Should(ContainSubstring("proxy_set_header X-Forwarded-Prefix \"/test/value\";")) @@ -49,7 +49,7 @@ var _ = framework.IngressNginxDescribe("Annotations - X-Forwarded-Prefix", func( uri := "/" resp, body, errs := gorequest.New(). - Get(f.IngressController.HTTPURL+uri). + Get(f.GetURL(framework.HTTP)+uri). Set("Host", host). End() @@ -65,7 +65,7 @@ var _ = framework.IngressNginxDescribe("Annotations - X-Forwarded-Prefix", func( "nginx.ingress.kubernetes.io/rewrite-target": "/foo", } - f.EnsureIngress(framework.NewSingleIngress(host, "/", host, f.IngressController.Namespace, "http-svc", 80, &annotations)) + f.EnsureIngress(framework.NewSingleIngress(host, "/", host, f.Namespace, "http-svc", 80, &annotations)) f.WaitForNginxServer(host, func(server string) bool { return Expect(server).Should(And(ContainSubstring(host), Not(ContainSubstring("proxy_set_header X-Forwarded-Prefix")))) @@ -73,7 +73,7 @@ var _ = framework.IngressNginxDescribe("Annotations - X-Forwarded-Prefix", func( uri := "/" resp, body, errs := gorequest.New(). - Get(f.IngressController.HTTPURL+uri). + Get(f.GetURL(framework.HTTP)+uri). Set("Host", host). End()