update test file

Signed-off-by: Huabing (Robin) Zhao <[email protected]>

Author: zhaohuabing

internal/xds/translator/testdata/in/xds-ir/listener-overlapping-tls-config.yaml

@@ -58,22 +58,22 @@ http:
   port: 10443
   routes:
   - destination:
-      name: httproute/envoy-gateway/httproute-1/rule/0
+      name: httproute/envoy-gateway/httproute-2/rule/0
       settings:
       - addressType: IP
         endpoints:
         - host: 7.7.7.7
           port: 8080
-        name: httproute/envoy-gateway/httproute-1/rule/0/backend/0
+        name: httproute/envoy-gateway/httproute-2/rule/0/backend/0
         protocol: HTTP
         weight: 1
     hostname: '*.example.com'
     isHTTP2: false
     metadata:
       kind: HTTPRoute
-      name: httproute-1
+      name: httproute-2
       namespace: envoy-gateway
-    name: httproute/envoy-gateway/httproute-1/rule/0/match/0/*_example_com
+    name: httproute/envoy-gateway/httproute-2/rule/0/match/0/*_example_com
     pathMatch:
       distinct: false
       name: ""
@@ -93,30 +93,30 @@ http:
     kind: Gateway
     name: gateway-1
     namespace: envoy-gateway
-    sectionName: https-1
-  name: envoy-gateway/gateway-1/https-1
+    sectionName: https-3
+  name: envoy-gateway/gateway-1/https-3
   path:
     escapedSlashesAction: UnescapeAndRedirect
     mergeSlashes: true
   port: 8443
   routes:
   - destination:
-      name: httproute/envoy-gateway/httproute-1/rule/0
+      name: httproute/envoy-gateway/httproute-3/rule/0
       settings:
       - addressType: IP
         endpoints:
         - host: 7.7.7.7
           port: 8080
-        name: httproute/envoy-gateway/httproute-1/rule/0/backend/0
+        name: httproute/envoy-gateway/httproute-3/rule/0/backend/0
         protocol: HTTP
         weight: 1
     hostname: foo.example.com
     isHTTP2: false
     metadata:
       kind: HTTPRoute
-      name: httproute-1
+      name: httproute-3
       namespace: envoy-gateway
-    name: httproute/envoy-gateway/httproute-1/rule/0/match/0/foo_example_com
+    name: httproute/envoy-gateway/httproute-3/rule/0/match/0/foo_example_com
     pathMatch:
       distinct: false
       name: ""

internal/xds/translator/testdata/out/xds-ir/listener-overlapping-tls-config.clusters.yaml

@@ -22,3 +22,51 @@
   name: httproute/envoy-gateway/httproute-1/rule/0
   perConnectionBufferLimitBytes: 32768
   type: EDS
+- circuitBreakers:
+    thresholds:
+    - maxRetries: 1024
+  commonLbConfig: {}
+  connectTimeout: 10s
+  dnsLookupFamily: V4_PREFERRED
+  edsClusterConfig:
+    edsConfig:
+      ads: {}
+      resourceApiVersion: V3
+    serviceName: httproute/envoy-gateway/httproute-2/rule/0
+  ignoreHealthOnHostRemoval: true
+  lbPolicy: LEAST_REQUEST
+  loadBalancingPolicy:
+    policies:
+    - typedExtensionConfig:
+        name: envoy.load_balancing_policies.least_request
+        typedConfig:
+          '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest
+          localityLbConfig:
+            localityWeightedLbConfig: {}
+  name: httproute/envoy-gateway/httproute-2/rule/0
+  perConnectionBufferLimitBytes: 32768
+  type: EDS
+- circuitBreakers:
+    thresholds:
+    - maxRetries: 1024
+  commonLbConfig: {}
+  connectTimeout: 10s
+  dnsLookupFamily: V4_PREFERRED
+  edsClusterConfig:
+    edsConfig:
+      ads: {}
+      resourceApiVersion: V3
+    serviceName: httproute/envoy-gateway/httproute-3/rule/0
+  ignoreHealthOnHostRemoval: true
+  lbPolicy: LEAST_REQUEST
+  loadBalancingPolicy:
+    policies:
+    - typedExtensionConfig:
+        name: envoy.load_balancing_policies.least_request
+        typedConfig:
+          '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest
+          localityLbConfig:
+            localityWeightedLbConfig: {}
+  name: httproute/envoy-gateway/httproute-3/rule/0
+  perConnectionBufferLimitBytes: 32768
+  type: EDS

internal/xds/translator/testdata/out/xds-ir/listener-overlapping-tls-config.endpoints.yaml

@@ -10,3 +10,27 @@
     loadBalancingWeight: 1
     locality:
       region: httproute/envoy-gateway/httproute-1/rule/0/backend/0
+- clusterName: httproute/envoy-gateway/httproute-2/rule/0
+  endpoints:
+  - lbEndpoints:
+    - endpoint:
+        address:
+          socketAddress:
+            address: 7.7.7.7
+            portValue: 8080
+      loadBalancingWeight: 1
+    loadBalancingWeight: 1
+    locality:
+      region: httproute/envoy-gateway/httproute-2/rule/0/backend/0
+- clusterName: httproute/envoy-gateway/httproute-3/rule/0
+  endpoints:
+  - lbEndpoints:
+    - endpoint:
+        address:
+          socketAddress:
+            address: 7.7.7.7
+            portValue: 8080
+      loadBalancingWeight: 1
+    loadBalancingWeight: 1
+    locality:
+      region: httproute/envoy-gateway/httproute-3/rule/0/backend/0

internal/xds/translator/testdata/out/xds-ir/listener-overlapping-tls-config.listeners.yaml

@@ -128,11 +128,11 @@
           configSource:
             ads: {}
             resourceApiVersion: V3
-          routeConfigName: envoy-gateway/gateway-1/https-1
+          routeConfigName: envoy-gateway/gateway-1/https-3
         serverHeaderTransformation: PASS_THROUGH
         statPrefix: https-8443
         useRemoteAddress: true
-    name: envoy-gateway/gateway-1/https-1
+    name: envoy-gateway/gateway-1/https-3
     transportSocket:
       name: envoy.transport_sockets.tls
       typedConfig:
@@ -152,5 +152,5 @@
     typedConfig:
       '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
   maxConnectionsToAcceptPerSocketEvent: 1
-  name: envoy-gateway/gateway-1/https-1
+  name: envoy-gateway/gateway-1/https-3
   perConnectionBufferLimitBytes: 32768

internal/xds/translator/testdata/out/xds-ir/listener-overlapping-tls-config.routes.yaml

@@ -27,17 +27,20 @@
         cluster: httproute/envoy-gateway/httproute-1/rule/0
         upgradeConfigs:
         - upgradeType: websocket
+- ignorePortInHostMatching: true
+  name: envoy-gateway/gateway-1/https-2
+  virtualHosts:
   - domains:
-    - foo.example.com
+    - '*.example.com'
     metadata:
       filterMetadata:
         envoy-gateway:
           resources:
           - kind: Gateway
             name: gateway-1
             namespace: envoy-gateway
-            sectionName: https-1
-    name: envoy-gateway/gateway-1/https-1/foo_example_com
+            sectionName: https-2
+    name: envoy-gateway/gateway-1/https-2/*_example_com
     routes:
     - match:
         prefix: /
@@ -46,27 +49,27 @@
           envoy-gateway:
             resources:
             - kind: HTTPRoute
-              name: httproute-1
+              name: httproute-2
               namespace: envoy-gateway
-      name: httproute/envoy-gateway/httproute-1/rule/0/match/0/foo_example_com
+      name: httproute/envoy-gateway/httproute-2/rule/0/match/0/*_example_com
       route:
-        cluster: httproute/envoy-gateway/httproute-1/rule/0
+        cluster: httproute/envoy-gateway/httproute-2/rule/0
         upgradeConfigs:
         - upgradeType: websocket
 - ignorePortInHostMatching: true
-  name: envoy-gateway/gateway-1/https-2
+  name: envoy-gateway/gateway-1/https-3
   virtualHosts:
   - domains:
-    - '*.example.com'
+    - foo.example.com
     metadata:
       filterMetadata:
         envoy-gateway:
           resources:
           - kind: Gateway
             name: gateway-1
             namespace: envoy-gateway
-            sectionName: https-2
-    name: envoy-gateway/gateway-1/https-2/*_example_com
+            sectionName: https-3
+    name: envoy-gateway/gateway-1/https-3/foo_example_com
     routes:
     - match:
         prefix: /
@@ -75,10 +78,10 @@
           envoy-gateway:
             resources:
             - kind: HTTPRoute
-              name: httproute-1
+              name: httproute-3
               namespace: envoy-gateway
-      name: httproute/envoy-gateway/httproute-1/rule/0/match/0/*_example_com
+      name: httproute/envoy-gateway/httproute-3/rule/0/match/0/foo_example_com
       route:
-        cluster: httproute/envoy-gateway/httproute-1/rule/0
+        cluster: httproute/envoy-gateway/httproute-3/rule/0
         upgradeConfigs:
         - upgradeType: websocket