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

[Cherry Pick] - Fix default backend annotation and tests (#7487)

Browse source 
* Make custom-default-backend upstream name more unique.

Signed-off-by: Robin Elfrink <robin.elfrink@eu.equinix.com>

* Fix default backend annotation test (#7486)

Co-authored-by: Robin Elfrink <robin.elfrink@eu.equinix.com>
This commit is contained in:
Ricardo Katz 2021-08-12 23:24:22 -03:00 • committed by GitHub
parent f973f3ffda
commit a091b01f43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -116,7 +116,7 @@ var _ = framework.DescribeAnnotation("custom-http-errors", func() {
}
return false
})
assert.Contains(ginkgo.GinkgoT(), serverConfig, errorBlockName(fmt.Sprintf("custom-default-backend-%s", customDefaultBackend), "503"))
assert.Contains(ginkgo.GinkgoT(), serverConfig, fmt.Sprintf("error_page %s = %s", "503", errorBlockName(fmt.Sprintf("custom-default-backend-%s", customDefaultBackend), "503")))
assert.Contains(ginkgo.GinkgoT(), serverConfig, errorBlockName(fmt.Sprintf("custom-default-backend-%s-%s", f.Namespace, customDefaultBackend), "503"))
assert.Contains(ginkgo.GinkgoT(), serverConfig, fmt.Sprintf("error_page %s = %s", "503", errorBlockName(fmt.Sprintf("custom-default-backend-%s-%s", f.Namespace, customDefaultBackend), "503")))
})
})