make catch all route name unique across mulitple hosts

Signed-off-by: huabing zhao <[email protected]>
envoyproxy · Feb 14, 2024 · 8674c4a · 8674c4a
1 parent d78c089
commit 8674c4a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.out.yaml
@@ -161,7 +161,7 @@ xdsIR:
         directResponse:
           statusCode: 404
         hostname: gateway.envoyproxy.io
-        name: catch-all
+        name: gateway_envoyproxy_io/catch_all
         pathMatch:
           distinct: false
           name: ""

diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth.out.yaml
@@ -278,7 +278,7 @@ xdsIR:
         directResponse:
           statusCode: 404
         hostname: www.foo.com
-        name: catch-all
+        name: www_foo_com/catch_all
         pathMatch:
           distinct: false
           name: ""
@@ -289,7 +289,7 @@ xdsIR:
         directResponse:
           statusCode: 404
         hostname: www.bar.com
-        name: catch-all
+        name: www_bar_com/catch_all
         pathMatch:
           distinct: false
           name: ""

diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc.in.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc.in.yaml
@@ -62,15 +62,15 @@ httpRoutes:
     name: httproute-2
   spec:
     hostnames:
-    - www.example.com
+    - www.foo.com
     parentRefs:
     - namespace: envoy-gateway
       name: gateway-1
       sectionName: http
     rules:
     - matches:
       - path:
-          value: "/bar"
+          value: "/"
       backendRefs:
       - name: service-1
         port: 8080

diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc.out.yaml
@@ -86,7 +86,7 @@ httpRoutes:
     namespace: default
   spec:
     hostnames:
-    - www.example.com
+    - www.foo.com
     parentRefs:
     - name: gateway-1
       namespace: envoy-gateway
@@ -97,7 +97,7 @@ httpRoutes:
         port: 8080
       matches:
       - path:
-          value: /bar
+          value: /
   status:
     parents:
     - conditions:
@@ -256,8 +256,8 @@ xdsIR:
               port: 8080
             protocol: HTTP
             weight: 1
-        hostname: www.example.com
-        name: httproute/default/httproute-2/rule/0/match/0/www_example_com
+        hostname: www.foo.com
+        name: httproute/default/httproute-2/rule/0/match/0/www_foo_com
         oidc:
           clientID: client1.apps.googleusercontent.com
           clientSecret: Y2xpZW50MTpzZWNyZXQK
@@ -272,14 +272,14 @@ xdsIR:
         pathMatch:
           distinct: false
           name: ""
-          prefix: /bar
+          prefix: /
       - backendWeights:
           invalid: 0
           valid: 0
         directResponse:
           statusCode: 404
         hostname: www.example.com
-        name: catch-all
+        name: www_example_com/catch_all
         pathMatch:
           distinct: false
           name: ""

diff --git a/internal/gatewayapi/translator.go b/internal/gatewayapi/translator.go
@@ -6,6 +6,9 @@
 package gatewayapi
 
 import (
+	"fmt"
+	"strings"
+
 	"golang.org/x/exp/maps"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/utils/ptr"
@@ -240,8 +243,9 @@ func addCatchAllRoute(xdsIR map[string]*ir.Xds) {
 
 			for host, needCatchAllRoute := range needCatchAllRoutePerHost {
 				if needCatchAllRoute {
+					underscoredHost := strings.ReplaceAll(host, ".", "_")
 					http.Routes = append(http.Routes, &ir.HTTPRoute{
-						Name: "catch-all",
+						Name: fmt.Sprintf("%s/catch_all", underscoredHost),
 						PathMatch: &ir.StringMatch{
 							Prefix: ptr.To("/"),
 						},