From a091b01f436b4ab4f3d04264df93962432a02450 Mon Sep 17 00:00:00 2001 From: Ricardo Katz Date: Thu, 12 Aug 2021 23:24:22 -0300 Subject: [PATCH] [Cherry Pick] - Fix default backend annotation and tests (#7487) * Make custom-default-backend upstream name more unique. Signed-off-by: Robin Elfrink * Fix default backend annotation test (#7486) Co-authored-by: Robin Elfrink --- internal/ingress/controller/controller.go | 2 +- test/e2e/annotations/customhttperrors.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/ingress/controller/controller.go b/internal/ingress/controller/controller.go index 27cd2ffe4..70a075a53 100644 --- a/internal/ingress/controller/controller.go +++ b/internal/ingress/controller/controller.go @@ -727,7 +727,7 @@ func (n *NGINXController) getBackendServers(ingresses []*ingress.Ingress) ([]*in endps := getEndpoints(location.DefaultBackend, &sp, apiv1.ProtocolTCP, n.store.GetServiceEndpoints) // custom backend is valid only if contains at least one endpoint if len(endps) > 0 { - name := fmt.Sprintf("custom-default-backend-%v", location.DefaultBackend.GetName()) + name := fmt.Sprintf("custom-default-backend-%v-%v", location.DefaultBackend.GetNamespace(), location.DefaultBackend.GetName()) klog.V(3).Infof("Creating \"%v\" upstream based on default backend annotation", name) nb := upstream.DeepCopy() diff --git a/test/e2e/annotations/customhttperrors.go b/test/e2e/annotations/customhttperrors.go index 6f7c26b3c..c0115cb52 100644 --- a/test/e2e/annotations/customhttperrors.go +++ b/test/e2e/annotations/customhttperrors.go @@ -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"))) }) })