test: update

Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
kumahq · Oct 20, 2023 · 04542f0 · 04542f0
1 parent f904f5c
commit 04542f0
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 63 deletions.
diff --git a/pkg/xds/generator/testdata/outbound-proxy/03.envoy.golden.yaml b/pkg/xds/generator/testdata/outbound-proxy/03.envoy.golden.yaml
@@ -97,30 +97,30 @@ resources:
         '@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
         explicitHttpConfig:
           http2ProtocolOptions: {}
-- name: db-_0_
+- name: db-c182dd9f4bf584d7
   resource:
     '@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
     connectTimeout: 10s
     edsClusterConfig:
       edsConfig:
         ads: {}
         resourceApiVersion: V3
-    name: db-_0_
+    name: db-c182dd9f4bf584d7
     type: EDS
     typedExtensionProtocolOptions:
       envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
         '@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
         explicitHttpConfig:
           http2ProtocolOptions: {}
-- name: db-_1_
+- name: db-f7d9086d4169338b
   resource:
     '@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
     connectTimeout: 10s
     edsClusterConfig:
       edsConfig:
         ads: {}
         resourceApiVersion: V3
-    name: db-_1_
+    name: db-f7d9086d4169338b
     type: EDS
     typedExtensionProtocolOptions:
       envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
@@ -253,42 +253,42 @@ resources:
               address: 192.168.0.2
               portValue: 8082
         loadBalancingWeight: 1
-- name: db-_0_
+- name: db-c182dd9f4bf584d7
   resource:
     '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment
-    clusterName: db-_0_
+    clusterName: db-c182dd9f4bf584d7
     endpoints:
     - lbEndpoints:
       - endpoint:
           address:
             socketAddress:
               address: 192.168.0.3
-              portValue: 5432
+              portValue: 5433
         loadBalancingWeight: 1
         metadata:
           filterMetadata:
             envoy.lb:
-              role: master
+              role: replica
             envoy.transport_socket_match:
-              role: master
-- name: db-_1_
+              role: replica
+- name: db-f7d9086d4169338b
   resource:
     '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment
-    clusterName: db-_1_
+    clusterName: db-f7d9086d4169338b
     endpoints:
     - lbEndpoints:
       - endpoint:
           address:
             socketAddress:
               address: 192.168.0.3
-              portValue: 5433
+              portValue: 5432
         loadBalancingWeight: 1
         metadata:
           filterMetadata:
             envoy.lb:
-              role: replica
+              role: master
             envoy.transport_socket_match:
-              role: replica
+              role: master
 - name: outbound:127.0.0.1:18080
   resource:
     '@type': type.googleapis.com/envoy.config.listener.v3.Listener
@@ -498,9 +498,9 @@ resources:
           statPrefix: db
           weightedClusters:
             clusters:
-            - name: db-_0_
+            - name: db-f7d9086d4169338b
               weight: 10
-            - name: db-_1_
+            - name: db-c182dd9f4bf584d7
               weight: 90
     metadata:
       filterMetadata:

diff --git a/pkg/xds/generator/testdata/outbound-proxy/04.envoy.golden.yaml b/pkg/xds/generator/testdata/outbound-proxy/04.envoy.golden.yaml
@@ -128,15 +128,15 @@ resources:
         '@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
         explicitHttpConfig:
           http2ProtocolOptions: {}
-- name: db-_0_
+- name: db-c182dd9f4bf584d7
   resource:
     '@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
     connectTimeout: 10s
     edsClusterConfig:
       edsConfig:
         ads: {}
         resourceApiVersion: V3
-    name: db-_0_
+    name: db-c182dd9f4bf584d7
     transportSocket:
       name: envoy.transport_sockets.tls
       typedConfig:
@@ -160,22 +160,22 @@ resources:
             sdsConfig:
               ads: {}
               resourceApiVersion: V3
-        sni: db{mesh=mesh1,role=master}
+        sni: db{mesh=mesh1,role=replica}
     type: EDS
     typedExtensionProtocolOptions:
       envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
         '@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
         explicitHttpConfig:
           http2ProtocolOptions: {}
-- name: db-_1_
+- name: db-f7d9086d4169338b
   resource:
     '@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
     connectTimeout: 10s
     edsClusterConfig:
       edsConfig:
         ads: {}
         resourceApiVersion: V3
-    name: db-_1_
+    name: db-f7d9086d4169338b
     transportSocket:
       name: envoy.transport_sockets.tls
       typedConfig:
@@ -199,7 +199,7 @@ resources:
             sdsConfig:
               ads: {}
               resourceApiVersion: V3
-        sni: db{mesh=mesh1,role=replica}
+        sni: db{mesh=mesh1,role=master}
     type: EDS
     typedExtensionProtocolOptions:
       envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
@@ -296,42 +296,42 @@ resources:
               address: 192.168.0.2
               portValue: 8082
         loadBalancingWeight: 1
-- name: db-_0_
+- name: db-c182dd9f4bf584d7
   resource:
     '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment
-    clusterName: db-_0_
+    clusterName: db-c182dd9f4bf584d7
     endpoints:
     - lbEndpoints:
       - endpoint:
           address:
             socketAddress:
               address: 192.168.0.3
-              portValue: 5432
+              portValue: 5433
         loadBalancingWeight: 1
         metadata:
           filterMetadata:
             envoy.lb:
-              role: master
+              role: replica
             envoy.transport_socket_match:
-              role: master
-- name: db-_1_
+              role: replica
+- name: db-f7d9086d4169338b
   resource:
     '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment
-    clusterName: db-_1_
+    clusterName: db-f7d9086d4169338b
     endpoints:
     - lbEndpoints:
       - endpoint:
           address:
             socketAddress:
               address: 192.168.0.3
-              portValue: 5433
+              portValue: 5432
         loadBalancingWeight: 1
         metadata:
           filterMetadata:
             envoy.lb:
-              role: replica
+              role: master
             envoy.transport_socket_match:
-              role: replica
+              role: master
 - name: outbound:127.0.0.1:18080
   resource:
     '@type': type.googleapis.com/envoy.config.listener.v3.Listener
@@ -455,9 +455,9 @@ resources:
           statPrefix: db
           weightedClusters:
             clusters:
-            - name: db-_0_
+            - name: db-f7d9086d4169338b
               weight: 10
-            - name: db-_1_
+            - name: db-c182dd9f4bf584d7
               weight: 90
     metadata:
       filterMetadata:

diff --git a/pkg/xds/generator/testdata/outbound-proxy/05.envoy.golden.yaml b/pkg/xds/generator/testdata/outbound-proxy/05.envoy.golden.yaml
@@ -1,10 +1,10 @@
 resources:
-- name: es-_0_
+- name: es-be7aaa8dde77c2c8
   resource:
     '@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
     connectTimeout: 10s
     loadAssignment:
-      clusterName: es-_0_
+      clusterName: es-be7aaa8dde77c2c8
       endpoints:
       - lbEndpoints:
         - endpoint:
@@ -19,7 +19,7 @@ resources:
                 kuma.io/protocol: http
               envoy.transport_socket_match:
                 kuma.io/protocol: http
-    name: es-_0_
+    name: es-be7aaa8dde77c2c8
     type: STATIC
     typedExtensionProtocolOptions:
       envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
@@ -63,7 +63,7 @@ resources:
                   prefix: /
                 route:
                   autoHostRewrite: true
-                  cluster: es-_0_
+                  cluster: es-be7aaa8dde77c2c8
                   timeout: 0s
           statPrefix: es
           streamIdleTimeout: 0s

diff --git a/pkg/xds/generator/testdata/outbound-proxy/06.envoy.golden.yaml b/pkg/xds/generator/testdata/outbound-proxy/06.envoy.golden.yaml
@@ -1,10 +1,10 @@
 resources:
-- name: es2-_0_
+- name: es2-ff6df687ce12e5f4
   resource:
     '@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
     connectTimeout: 100s
     loadAssignment:
-      clusterName: es2-_0_
+      clusterName: es2-ff6df687ce12e5f4
       endpoints:
       - lbEndpoints:
         - endpoint:
@@ -19,7 +19,7 @@ resources:
                 kuma.io/protocol: http2
               envoy.transport_socket_match:
                 kuma.io/protocol: http2
-    name: es2-_0_
+    name: es2-ff6df687ce12e5f4
     type: STATIC
     typedExtensionProtocolOptions:
       envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
@@ -63,7 +63,7 @@ resources:
                   prefix: /
                 route:
                   autoHostRewrite: true
-                  cluster: es2-_0_
+                  cluster: es2-ff6df687ce12e5f4
                   timeout: 102s
           statPrefix: es2
           streamIdleTimeout: 0s

diff --git a/pkg/xds/generator/testdata/outbound-proxy/08.envoy.golden.yaml b/pkg/xds/generator/testdata/outbound-proxy/08.envoy.golden.yaml
@@ -1,10 +1,10 @@
 resources:
-- name: es2-_0_
+- name: es2-b5516780eaf1ed13
   resource:
     '@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
     connectTimeout: 10s
     loadAssignment:
-      clusterName: es2-_0_
+      clusterName: es2-b5516780eaf1ed13
       endpoints:
       - lbEndpoints:
         - endpoint:
@@ -19,7 +19,7 @@ resources:
                 kuma.io/protocol: http2
               envoy.transport_socket_match:
                 kuma.io/protocol: http2
-    name: es2-_0_
+    name: es2-b5516780eaf1ed13
     type: STATIC
     typedExtensionProtocolOptions:
       envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
@@ -28,12 +28,12 @@ resources:
           idleTimeout: 0s
         explicitHttpConfig:
           http2ProtocolOptions: {}
-- name: es2-_1_
+- name: es2-d79214c8b3a5805b
   resource:
     '@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
     connectTimeout: 10s
     loadAssignment:
-      clusterName: es2-_1_
+      clusterName: es2-d79214c8b3a5805b
       endpoints:
       - lbEndpoints:
         - endpoint:
@@ -48,7 +48,7 @@ resources:
                 kuma.io/protocol: http2
               envoy.transport_socket_match:
                 kuma.io/protocol: http2
-    name: es2-_1_
+    name: es2-d79214c8b3a5805b
     type: STATIC
     typedExtensionProtocolOptions:
       envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
@@ -95,9 +95,9 @@ resources:
                   timeout: 0s
                   weightedClusters:
                     clusters:
-                    - name: es2-_0_
+                    - name: es2-b5516780eaf1ed13
                       weight: 10
-                    - name: es2-_1_
+                    - name: es2-d79214c8b3a5805b
                       weight: 90
           statPrefix: es2
           streamIdleTimeout: 0s
@@ -145,9 +145,9 @@ resources:
                   timeout: 0s
                   weightedClusters:
                     clusters:
-                    - name: es2-_0_
+                    - name: es2-b5516780eaf1ed13
                       weight: 10
-                    - name: es2-_1_
+                    - name: es2-d79214c8b3a5805b
                       weight: 90
           statPrefix: es2
           streamIdleTimeout: 0s
@@ -195,9 +195,9 @@ resources:
                   timeout: 0s
                   weightedClusters:
                     clusters:
-                    - name: es2-_0_
+                    - name: es2-b5516780eaf1ed13
                       weight: 10
-                    - name: es2-_1_
+                    - name: es2-d79214c8b3a5805b
                       weight: 90
           statPrefix: es2
           streamIdleTimeout: 0s

diff --git a/pkg/xds/generator/testdata/outbound-proxy/09.envoy.golden.yaml b/pkg/xds/generator/testdata/outbound-proxy/09.envoy.golden.yaml
@@ -1,13 +1,13 @@
 resources:
-- name: api-http-_0__mesh2
+- name: api-http-5637c619d2781fec_mesh2
   resource:
     '@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
     connectTimeout: 10s
     edsClusterConfig:
       edsConfig:
         ads: {}
         resourceApiVersion: V3
-    name: api-http-_0__mesh2
+    name: api-http-5637c619d2781fec_mesh2
     outlierDetection:
       enforcingConsecutive5xx: 100
       enforcingConsecutiveGatewayFailure: 0
@@ -46,10 +46,10 @@ resources:
           idleTimeout: 0s
         explicitHttpConfig:
           http2ProtocolOptions: {}
-- name: api-http-_0__mesh2
+- name: api-http-5637c619d2781fec_mesh2
   resource:
     '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment
-    clusterName: api-http-_0__mesh2
+    clusterName: api-http-5637c619d2781fec_mesh2
     endpoints:
     - lbEndpoints:
       - endpoint:
@@ -108,7 +108,7 @@ resources:
               - match:
                   prefix: /
                 route:
-                  cluster: api-http-_0__mesh2
+                  cluster: api-http-5637c619d2781fec_mesh2
                   timeout: 0s
           statPrefix: api-http
           streamIdleTimeout: 0s