BUG/MINOR: prevents clash on custom routes names to avoid unecessary …

…restarts
haproxytech · Sep 2, 2023 · e490d62 · e490d62
1 parent 6d18884
commit e490d62
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/pkg/ingress/ingress.go b/pkg/ingress/ingress.go
@@ -15,6 +15,7 @@
 package ingress
 
 import (
+	"fmt"
 	"path/filepath"
 
 	"github.com/haproxytech/kubernetes-ingress/pkg/annotations"
@@ -109,17 +110,18 @@ func (i *Ingress) handlePath(k store.K8s, h haproxy.HAProxy, host string, path *
 		BackendName:    backendName,
 		SSLPassthrough: i.sslPassthrough,
 	}
+	customRouteID := fmt.Sprintf("%s_%s:%s", i.resource.Namespace, i.resource.Name, backendName)
 
 	routeACLAnn := a.String("route-acl", svc.GetResource().Annotations)
 	if routeACLAnn == "" {
-		if _, ok := route.CustomRoutes[backendName]; ok {
-			delete(route.CustomRoutes, backendName)
+		if _, ok := route.CustomRoutes[customRouteID]; ok {
+			delete(route.CustomRoutes, customRouteID)
 			logger.Debugf("Custom Route to backend '%s' deleted, reload required", backendName)
 			routeReload = true
 		}
 		err = route.AddHostPathRoute(ingRoute, h.Maps)
 	} else {
-		routeReload, err = route.AddCustomRoute(ingRoute, routeACLAnn, h)
+		routeReload, err = route.AddCustomRoute(customRouteID, ingRoute, routeACLAnn, h)
 	}
 	if err != nil {
 		return

diff --git a/pkg/route/route.go b/pkg/route/route.go
@@ -100,7 +100,7 @@ func AddHostPathRoute(route Route, mapFiles maps.Maps) error {
 }
 
 // AddCustomRoute adds an ingress route with specific ACL via use_backend haproxy directive
-func AddCustomRoute(route Route, routeACLAnn string, api api.HAProxyClient) (reload bool, err error) {
+func AddCustomRoute(customRouteID string, route Route, routeACLAnn string, api api.HAProxyClient) (reload bool, err error) {
 	var routeCond string
 	if route.Host != "" {
 		routeCond = fmt.Sprintf("{ var(txn.host) -m str %s } ", route.Host)
@@ -125,8 +125,8 @@ func AddCustomRoute(route Route, routeACLAnn string, api api.HAProxyClient) (rel
 			return
 		}
 	}
-	if acl := CustomRoutes[route.BackendName]; acl != routeCond {
-		CustomRoutes[route.BackendName] = routeCond
+	if acl := CustomRoutes[customRouteID]; acl != routeCond {
+		CustomRoutes[customRouteID] = routeCond
 		reload = true
 		logger.Debugf("Custom Route to backend '%s' added, reload required", route.BackendName)
 	}