diff --git a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml index 06afc627840..83d2c82e6d8 100644 --- a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml @@ -598,7 +598,8 @@ xds: portValue: 8000 loadBalancingWeight: 1 loadBalancingWeight: 1 - locality: {} + locality: + region: httproute/default/backend/rule/0/backend/0 - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment clusterName: grpcroute/default/backend/rule/0 @@ -611,7 +612,8 @@ xds: portValue: 9000 loadBalancingWeight: 1 loadBalancingWeight: 1 - locality: {} + locality: + region: grpcroute/default/backend/rule/0/backend/0 - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment clusterName: tlsroute/default/backend/rule/-1 @@ -624,7 +626,8 @@ xds: portValue: 3000 loadBalancingWeight: 1 loadBalancingWeight: 1 - locality: {} + locality: + region: tlsroute/default/backend/rule/-1/backend/0 - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment clusterName: tcproute/default/backend/rule/-1 @@ -637,7 +640,8 @@ xds: portValue: 3000 loadBalancingWeight: 1 loadBalancingWeight: 1 - locality: {} + locality: + region: tcproute/default/backend/rule/-1/backend/0 - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment clusterName: udproute/default/backend/rule/-1 @@ -650,7 +654,8 @@ xds: portValue: 3000 loadBalancingWeight: 1 loadBalancingWeight: 1 - locality: {} + locality: + region: udproute/default/backend/rule/-1/backend/0 - '@type': type.googleapis.com/envoy.admin.v3.ClustersConfigDump dynamicActiveClusters: - cluster: diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json index 53fc117ef6e..1e461964bbf 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json @@ -235,7 +235,9 @@ } ], "loadBalancingWeight": 1, - "locality": {} + "locality": { + "region": "httproute/default/backend/rule/0/backend/0" + } } ] } @@ -260,7 +262,9 @@ } ], "loadBalancingWeight": 1, - "locality": {} + "locality": { + "region": "grpcroute/default/backend/rule/0/backend/0" + } } ] } @@ -285,7 +289,9 @@ } ], "loadBalancingWeight": 1, - "locality": {} + "locality": { + "region": "tlsroute/default/backend/rule/-1/backend/0" + } } ] } @@ -310,7 +316,9 @@ } ], "loadBalancingWeight": 1, - "locality": {} + "locality": { + "region": "tcproute/default/backend/rule/-1/backend/0" + } } ] } @@ -335,7 +343,9 @@ } ], "loadBalancingWeight": 1, - "locality": {} + "locality": { + "region": "udproute/default/backend/rule/-1/backend/0" + } } ] } diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml index 40cee9b63a0..5c5b27e97f9 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml @@ -131,7 +131,8 @@ xds: portValue: 3000 loadBalancingWeight: 1 loadBalancingWeight: 1 - locality: {} + locality: + region: httproute/default/backend/rule/0/backend/0 - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment clusterName: grpcroute/default/backend/rule/0 @@ -144,7 +145,8 @@ xds: portValue: 9000 loadBalancingWeight: 1 loadBalancingWeight: 1 - locality: {} + locality: + region: grpcroute/default/backend/rule/0/backend/0 - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment clusterName: tlsroute/default/backend/rule/-1 @@ -157,7 +159,8 @@ xds: portValue: 3000 loadBalancingWeight: 1 loadBalancingWeight: 1 - locality: {} + locality: + region: tlsroute/default/backend/rule/-1/backend/0 - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment clusterName: tcproute/default/backend/rule/-1 @@ -170,7 +173,8 @@ xds: portValue: 3000 loadBalancingWeight: 1 loadBalancingWeight: 1 - locality: {} + locality: + region: tcproute/default/backend/rule/-1/backend/0 - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment clusterName: udproute/default/backend/rule/-1 @@ -183,7 +187,8 @@ xds: portValue: 3000 loadBalancingWeight: 1 loadBalancingWeight: 1 - locality: {} + locality: + region: udproute/default/backend/rule/-1/backend/0 - '@type': type.googleapis.com/envoy.admin.v3.ClustersConfigDump dynamicActiveClusters: - cluster: diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.endpoint.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.endpoint.yaml index 4b510ae5bfc..76b49b6fa24 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.endpoint.yaml +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.endpoint.yaml @@ -14,7 +14,8 @@ xds: portValue: 3000 loadBalancingWeight: 1 loadBalancingWeight: 1 - locality: {} + locality: + region: httproute/default/backend/rule/0/backend/0 - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment clusterName: grpcroute/default/backend/rule/0 @@ -27,7 +28,8 @@ xds: portValue: 9000 loadBalancingWeight: 1 loadBalancingWeight: 1 - locality: {} + locality: + region: grpcroute/default/backend/rule/0/backend/0 - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment clusterName: tlsroute/default/backend/rule/-1 @@ -40,7 +42,8 @@ xds: portValue: 3000 loadBalancingWeight: 1 loadBalancingWeight: 1 - locality: {} + locality: + region: tlsroute/default/backend/rule/-1/backend/0 - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment clusterName: tcproute/default/backend/rule/-1 @@ -53,7 +56,8 @@ xds: portValue: 3000 loadBalancingWeight: 1 loadBalancingWeight: 1 - locality: {} + locality: + region: tcproute/default/backend/rule/-1/backend/0 - endpointConfig: '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment clusterName: udproute/default/backend/rule/-1 @@ -66,4 +70,5 @@ xds: portValue: 3000 loadBalancingWeight: 1 loadBalancingWeight: 1 - locality: {} + locality: + region: udproute/default/backend/rule/-1/backend/0 diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json index 11c9c3261e2..16c1d3522fc 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json +++ b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json @@ -235,7 +235,9 @@ } ], "loadBalancingWeight": 1, - "locality": {} + "locality": { + "region": "httproute/envoy-gateway-system/backend/rule/0/backend/0" + } } ] } @@ -295,7 +297,9 @@ } ], "loadBalancingWeight": 1, - "locality": {} + "locality": { + "region": "raw_githubusercontent_com_443/backend/0" + } } ] }, diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml index c5470eebb98..8b70c138d50 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml @@ -131,7 +131,8 @@ xds: portValue: 3000 loadBalancingWeight: 1 loadBalancingWeight: 1 - locality: {} + locality: + region: httproute/envoy-gateway-system/backend/rule/0/backend/0 - '@type': type.googleapis.com/envoy.admin.v3.ClustersConfigDump dynamicActiveClusters: - cluster: @@ -169,7 +170,8 @@ xds: portValue: 443 loadBalancingWeight: 1 loadBalancingWeight: 1 - locality: {} + locality: + region: raw_githubusercontent_com_443/backend/0 name: raw_githubusercontent_com_443 outlierDetection: {} perConnectionBufferLimitBytes: 32768 diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.cluster.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.cluster.yaml index aa29280bb37..47f144cbe20 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.cluster.yaml +++ b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.cluster.yaml @@ -37,7 +37,8 @@ xds: portValue: 443 loadBalancingWeight: 1 loadBalancingWeight: 1 - locality: {} + locality: + region: raw_githubusercontent_com_443/backend/0 name: raw_githubusercontent_com_443 outlierDetection: {} perConnectionBufferLimitBytes: 32768