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

Merge pull request #3494 from aledbf/remove-503

Browse source 
Since dynamic mode only checking for 'return 503' is not valid anymore
This commit is contained in:
k8s-ci-robot 2018-11-30 06:32:20 -08:00 committed by GitHub
commit 50b552da9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/e2e/annotations/alias.go
View file

@ -46,8 +46,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Alias", func() {
f.WaitForNginxServer(host,
func(server string) bool {
return Expect(server).Should(ContainSubstring("server_name foo")) &&
Expect(server).ShouldNot(ContainSubstring("return 503"))
return Expect(server).Should(ContainSubstring("server_name foo"))
})
resp, body, errs := gorequest.New().
@ -80,8 +79,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Alias", func() {
f.WaitForNginxServer(host,
func(server string) bool {
return Expect(server).Should(ContainSubstring("server_name foo")) &&
Expect(server).ShouldNot(ContainSubstring("return 503"))
return Expect(server).Should(ContainSubstring("server_name foo"))
})
hosts := []string{"foo", "bar"}

22
test/e2e/annotations/auth.go
View file

@ -53,8 +53,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() {
f.WaitForNginxServer(host,
func(server string) bool {
return Expect(server).Should(ContainSubstring("server_name auth")) &&
Expect(server).ShouldNot(ContainSubstring("return 503"))
return Expect(server).Should(ContainSubstring("server_name auth"))
})
resp, body, errs := gorequest.New().
@ -81,8 +80,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() {
f.WaitForNginxServer(host,
func(server string) bool {
return Expect(server).Should(ContainSubstring("server_name auth")) &&
Expect(server).Should(ContainSubstring("return 503"))
return Expect(server).Should(ContainSubstring("server_name auth"))
})
resp, body, errs := gorequest.New().
@ -112,8 +110,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() {
f.WaitForNginxServer(host,
func(server string) bool {
return Expect(server).Should(ContainSubstring("server_name auth")) &&
Expect(server).ShouldNot(ContainSubstring("return 503"))
return Expect(server).Should(ContainSubstring("server_name auth"))
})
resp, body, errs := gorequest.New().
@ -143,8 +140,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() {
f.WaitForNginxServer(host,
func(server string) bool {
return Expect(server).Should(ContainSubstring("server_name auth")) &&
Expect(server).ShouldNot(ContainSubstring("return 503"))
return Expect(server).Should(ContainSubstring("server_name auth"))
})
resp, body, errs := gorequest.New().
@ -175,8 +171,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() {
f.WaitForNginxServer(host,
func(server string) bool {
return Expect(server).Should(ContainSubstring("server_name auth")) &&
Expect(server).ShouldNot(ContainSubstring("return 503"))
return Expect(server).Should(ContainSubstring("server_name auth"))
})
resp, _, errs := gorequest.New().
@ -218,8 +213,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() {
f.WaitForNginxServer(host,
func(server string) bool {
return Expect(server).Should(ContainSubstring("server_name auth")) &&
Expect(server).ShouldNot(ContainSubstring("return 503"))
return Expect(server).Should(ContainSubstring("server_name auth"))
})
resp, _, errs := gorequest.New().
@ -275,7 +269,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() {
f.NewHttpbinDeployment()
var httpbinIP string
err := wait.PollImmediate(time.Second, time.Minute, func() (bool, error) {
err := wait.PollImmediate(framework.Poll, 5*time.Minute, func() (bool, error) {
e, err := f.KubeClientSet.CoreV1().Endpoints(f.IngressController.Namespace).Get("httpbin", metav1.GetOptions{})
if errors.IsNotFound(err) {
return false, nil
@ -300,7 +294,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() {
f.EnsureIngress(ing)
f.WaitForNginxServer(host, func(server string) bool {
return Expect(server).ShouldNot(ContainSubstring("return 503"))
return Expect(server).Should(ContainSubstring("server_name auth"))
})
})

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

@ -53,8 +53,7 @@ var _ = framework.IngressNginxDescribe("Annotations - canary", func() {
f.WaitForNginxServer(host,
func(server string) bool {
return Expect(server).Should(ContainSubstring("server_name foo")) &&
Expect(server).ShouldNot(ContainSubstring("return 503"))
return Expect(server).Should(ContainSubstring("server_name foo"))
})
canaryAnnotations := map[string]string{
@ -90,8 +89,7 @@ var _ = framework.IngressNginxDescribe("Annotations - canary", func() {
f.WaitForNginxServer(host,
func(server string) bool {
return Expect(server).Should(ContainSubstring("server_name foo")) &&
Expect(server).ShouldNot(ContainSubstring("return 503"))
return Expect(server).Should(ContainSubstring("server_name foo"))
})
canaryAnnotations := map[string]string{
@ -129,8 +127,7 @@ var _ = framework.IngressNginxDescribe("Annotations - canary", func() {
f.WaitForNginxServer(host,
func(server string) bool {
return Expect(server).Should(ContainSubstring("server_name foo")) &&
Expect(server).ShouldNot(ContainSubstring("return 503"))
return Expect(server).Should(ContainSubstring("server_name foo"))
})
canaryAnnotations := map[string]string{
@ -168,8 +165,7 @@ var _ = framework.IngressNginxDescribe("Annotations - canary", func() {
f.WaitForNginxServer(host,
func(server string) bool {
return Expect(server).Should(ContainSubstring("server_name foo")) &&
Expect(server).ShouldNot(ContainSubstring("return 503"))
return Expect(server).Should(ContainSubstring("server_name foo"))
})
canaryAnnotations := map[string]string{

3
test/e2e/annotations/grpc.go
View file

@ -45,8 +45,7 @@ var _ = framework.IngressNginxDescribe("Annotations - grpc", func() {
f.WaitForNginxServer(host,
func(server string) bool {
return Expect(server).Should(ContainSubstring(fmt.Sprintf("server_name %v", host))) &&
Expect(server).ShouldNot(ContainSubstring("return 503"))
return Expect(server).Should(ContainSubstring(fmt.Sprintf("server_name %v", host)))
})
f.WaitForNginxServer(host,

3
test/e2e/annotations/influxdb.go
View file

@ -128,8 +128,7 @@ func createInfluxDBIngress(f *framework.Framework, host, service string, port in
f.WaitForNginxServer(host,
func(server string) bool {
return Expect(server).Should(ContainSubstring(fmt.Sprintf("server_name %v", host))) &&
Expect(server).ShouldNot(ContainSubstring("return 503"))
return Expect(server).Should(ContainSubstring(fmt.Sprintf("server_name %v", host)))
})
}

3
test/e2e/annotations/luarestywaf.go
View file

@ -208,8 +208,7 @@ func createIngress(f *framework.Framework, host, service string, port int, annot
f.WaitForNginxServer(host,
func(server string) bool {
return Expect(server).Should(ContainSubstring(fmt.Sprintf("server_name %v", host))) &&
Expect(server).ShouldNot(ContainSubstring("return 503"))
return Expect(server).Should(ContainSubstring(fmt.Sprintf("server_name %v", host)))
})
time.Sleep(1 * time.Second)