From fa7ba851886da6880d0c7f1d02e186b1bdd07353 Mon Sep 17 00:00:00 2001 From: Jukie <10012479+Jukie@users.noreply.github.com> Date: Wed, 9 Jul 2025 18:25:54 -0600 Subject: [PATCH 1/6] Use non-staic local_cluster name Signed-off-by: Jukie <10012479+Jukie@users.noreply.github.com> --- .../translate/out/default-resources.all.yaml | 12 +++++------ .../out/from-gateway-api-to-xds.all.json | 6 +++--- .../out/from-gateway-api-to-xds.all.yaml | 6 +++--- .../from-gateway-api-to-xds.bootstrap.yaml | 6 +++--- ...-single-route-single-match-to-xds.all.json | 6 +++--- ...-single-route-single-match-to-xds.all.yaml | 6 +++--- ...e-route-single-match-to-xds.bootstrap.yaml | 6 +++--- .../out/no-service-cluster-ip.all.yaml | 6 +++--- .../kubernetes/proxy/resource.go | 12 ++++++++--- .../testdata/daemonsets/component-level.yaml | 4 ++++ .../proxy/testdata/daemonsets/custom.yaml | 10 +++++++--- .../testdata/daemonsets/default-env.yaml | 10 +++++++--- .../proxy/testdata/daemonsets/default.yaml | 10 +++++++--- .../daemonsets/disable-prometheus.yaml | 10 +++++++--- .../testdata/daemonsets/extension-env.yaml | 10 +++++++--- .../daemonsets/gateway-namespace-mode.yaml | 10 +++++++--- .../override-labels-and-annotations.yaml | 10 +++++++--- .../override-prometheus-annotations.yaml | 10 +++++++--- .../testdata/daemonsets/patch-daemonset.yaml | 10 +++++++--- .../testdata/daemonsets/shutdown-manager.yaml | 10 +++++++--- .../proxy/testdata/daemonsets/volumes.yaml | 10 +++++++--- .../testdata/daemonsets/with-annotations.yaml | 10 +++++++--- .../testdata/daemonsets/with-concurrency.yaml | 4 ++++ .../testdata/daemonsets/with-extra-args.yaml | 10 +++++++--- .../daemonsets/with-image-pull-secrets.yaml | 10 +++++++--- .../proxy/testdata/daemonsets/with-name.yaml | 10 +++++++--- .../daemonsets/with-node-selector.yaml | 10 +++++++--- .../with-topology-spread-constraints.yaml | 10 +++++++--- .../proxy/testdata/deployments/bootstrap.yaml | 4 ++++ .../testdata/deployments/component-level.yaml | 4 ++++ .../proxy/testdata/deployments/custom-sa.yaml | 10 +++++++--- .../proxy/testdata/deployments/custom.yaml | 10 +++++++--- .../custom_with_initcontainers.yaml | 10 +++++++--- .../testdata/deployments/default-env.yaml | 10 +++++++--- .../proxy/testdata/deployments/default.yaml | 10 +++++++--- .../deployments/disable-prometheus.yaml | 10 +++++++--- .../testdata/deployments/dual-stack.yaml | 10 +++++++--- .../testdata/deployments/extension-env.yaml | 10 +++++++--- .../deployments/gateway-namespace-mode.yaml | 10 +++++++--- .../proxy/testdata/deployments/ipv6.yaml | 10 +++++++--- .../override-labels-and-annotations.yaml | 10 +++++++--- .../override-prometheus-annotations.yaml | 10 +++++++--- .../deployments/patch-deployment.yaml | 10 +++++++--- .../deployments/shutdown-manager.yaml | 10 +++++++--- .../proxy/testdata/deployments/volumes.yaml | 10 +++++++--- .../deployments/with-annotations.yaml | 10 +++++++--- .../deployments/with-concurrency.yaml | 4 ++++ .../deployments/with-empty-memory-limits.yaml | 10 +++++++--- .../testdata/deployments/with-extra-args.yaml | 10 +++++++--- .../deployments/with-image-pull-secrets.yaml | 10 +++++++--- .../proxy/testdata/deployments/with-name.yaml | 10 +++++++--- .../deployments/with-node-selector.yaml | 10 +++++++--- .../with-topology-spread-constraints.yaml | 10 +++++++--- .../gateway-namespace-mode/deployment.yaml | 20 +++++++++++++------ internal/xds/bootstrap/bootstrap.yaml.tpl | 6 +++--- .../bootstrap/testdata/merge/default.out.yaml | 6 +++--- .../merge/merge-user-bootstrap.out.yaml | 6 +++--- .../merge/patch-global-config.out.yaml | 6 +++--- .../testdata/merge/stats_sinks.out.yaml | 6 +++--- .../testdata/render/custom-server-port.yaml | 6 +++--- .../testdata/render/custom-stats-matcher.yaml | 6 +++--- .../testdata/render/disable-prometheus.yaml | 6 +++--- .../enable-prometheus-brotli-compression.yaml | 6 +++--- .../enable-prometheus-gzip-compression.yaml | 6 +++--- .../testdata/render/enable-prometheus.yaml | 6 +++--- .../xds/bootstrap/testdata/render/ipv6.yaml | 6 +++--- .../render/otel-metrics-backendref.yaml | 6 +++--- .../testdata/render/otel-metrics.yaml | 6 +++--- .../render/with-max-heap-size-bytes.yaml | 6 +++--- 69 files changed, 388 insertions(+), 198 deletions(-) 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 31b11eb1af..4873277e36 100644 --- a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml @@ -20,7 +20,7 @@ envoyProxyForGatewayClass: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -97,7 +97,7 @@ envoyProxyForGatewayClass: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -109,7 +109,7 @@ envoyProxyForGatewayClass: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -560,7 +560,7 @@ xds: address: 127.0.0.1 portValue: 19000 clusterManager: - localClusterName: local_cluster + localClusterName: $(ENVOY_PROXY_INFRA_NAME) dynamicResources: adsConfig: apiType: DELTA_GRPC @@ -608,7 +608,7 @@ xds: type: STATIC - connectTimeout: 10s loadAssignment: - clusterName: local_cluster + clusterName: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lbEndpoints: - endpoint: @@ -620,7 +620,7 @@ xds: loadBalancingWeight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connectTimeout: 10s loadAssignment: 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 b592bd3e6a..d263b398ee 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 @@ -23,7 +23,7 @@ } }, "clusterManager": { - "localClusterName": "local_cluster" + "localClusterName": "$(ENVOY_PROXY_INFRA_NAME)" }, "dynamicResources": { "adsConfig": { @@ -105,7 +105,7 @@ { "connectTimeout": "10s", "loadAssignment": { - "clusterName": "local_cluster", + "clusterName": "$(ENVOY_PROXY_INFRA_NAME)", "endpoints": [ { "lbEndpoints": [ @@ -128,7 +128,7 @@ } ] }, - "name": "local_cluster", + "name": "$(ENVOY_PROXY_INFRA_NAME)", "type": "STATIC" }, { 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 0ce878805f..2944fd5e6b 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 @@ -14,7 +14,7 @@ xds: address: 127.0.0.1 portValue: 19000 clusterManager: - localClusterName: local_cluster + localClusterName: $(ENVOY_PROXY_INFRA_NAME) dynamicResources: adsConfig: apiType: DELTA_GRPC @@ -62,7 +62,7 @@ xds: type: STATIC - connectTimeout: 10s loadAssignment: - clusterName: local_cluster + clusterName: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lbEndpoints: - endpoint: @@ -74,7 +74,7 @@ xds: loadBalancingWeight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connectTimeout: 10s loadAssignment: diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.bootstrap.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.bootstrap.yaml index 6dcc5612c9..69f6a20043 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.bootstrap.yaml +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.bootstrap.yaml @@ -13,7 +13,7 @@ xds: address: 127.0.0.1 portValue: 19000 clusterManager: - localClusterName: local_cluster + localClusterName: $(ENVOY_PROXY_INFRA_NAME) dynamicResources: adsConfig: apiType: DELTA_GRPC @@ -61,7 +61,7 @@ xds: type: STATIC - connectTimeout: 10s loadAssignment: - clusterName: local_cluster + clusterName: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lbEndpoints: - endpoint: @@ -73,7 +73,7 @@ xds: loadBalancingWeight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connectTimeout: 10s loadAssignment: 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 1cfbb327fe..fe13fe2a7f 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 @@ -23,7 +23,7 @@ } }, "clusterManager": { - "localClusterName": "local_cluster" + "localClusterName": "$(ENVOY_PROXY_INFRA_NAME)" }, "dynamicResources": { "adsConfig": { @@ -105,7 +105,7 @@ { "connectTimeout": "10s", "loadAssignment": { - "clusterName": "local_cluster", + "clusterName": "$(ENVOY_PROXY_INFRA_NAME)", "endpoints": [ { "lbEndpoints": [ @@ -128,7 +128,7 @@ } ] }, - "name": "local_cluster", + "name": "$(ENVOY_PROXY_INFRA_NAME)", "type": "STATIC" }, { 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 afddaa3f01..5d68e544db 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 @@ -14,7 +14,7 @@ xds: address: 127.0.0.1 portValue: 19000 clusterManager: - localClusterName: local_cluster + localClusterName: $(ENVOY_PROXY_INFRA_NAME) dynamicResources: adsConfig: apiType: DELTA_GRPC @@ -62,7 +62,7 @@ xds: type: STATIC - connectTimeout: 10s loadAssignment: - clusterName: local_cluster + clusterName: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lbEndpoints: - endpoint: @@ -74,7 +74,7 @@ xds: loadBalancingWeight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connectTimeout: 10s loadAssignment: diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.bootstrap.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.bootstrap.yaml index c7675ded8b..7f520a2d4d 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.bootstrap.yaml +++ b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.bootstrap.yaml @@ -13,7 +13,7 @@ xds: address: 127.0.0.1 portValue: 19000 clusterManager: - localClusterName: local_cluster + localClusterName: $(ENVOY_PROXY_INFRA_NAME) dynamicResources: adsConfig: apiType: DELTA_GRPC @@ -61,7 +61,7 @@ xds: type: STATIC - connectTimeout: 10s loadAssignment: - clusterName: local_cluster + clusterName: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lbEndpoints: - endpoint: @@ -73,7 +73,7 @@ xds: loadBalancingWeight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connectTimeout: 10s loadAssignment: diff --git a/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml b/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml index 0553585ed2..8ff55fb199 100644 --- a/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml @@ -14,7 +14,7 @@ xds: address: 127.0.0.1 portValue: 19000 clusterManager: - localClusterName: local_cluster + localClusterName: $(ENVOY_PROXY_INFRA_NAME) dynamicResources: adsConfig: apiType: DELTA_GRPC @@ -62,7 +62,7 @@ xds: type: STATIC - connectTimeout: 10s loadAssignment: - clusterName: local_cluster + clusterName: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lbEndpoints: - endpoint: @@ -74,7 +74,7 @@ xds: loadBalancingWeight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connectTimeout: 10s loadAssignment: diff --git a/internal/infrastructure/kubernetes/proxy/resource.go b/internal/infrastructure/kubernetes/proxy/resource.go index 19e906404c..b5bf61aa11 100644 --- a/internal/infrastructure/kubernetes/proxy/resource.go +++ b/internal/infrastructure/kubernetes/proxy/resource.go @@ -33,6 +33,8 @@ const ( envoyPodEnvVar = "ENVOY_POD_NAME" // envoyZoneEnvVar is the Envoy pod locality zone name envoyZoneEnvVar = "ENVOY_SERVICE_ZONE" + // envoyInfraNameEnvVar is the name of the envoy proxy infrastructure + envoyInfraNameEnvVar = "ENVOY_PROXY_INFRA_NAME" ) // ExpectedResourceHashedName returns expected resource hashed name including up to the 48 characters of the original name. @@ -128,7 +130,7 @@ func expectedProxyContainers(infra *ir.ProxyInfra, ImagePullPolicy: corev1.PullIfNotPresent, Command: []string{"envoy"}, Args: args, - Env: expectedContainerEnv(containerSpec), + Env: expectedContainerEnv(infra, containerSpec), Resources: *containerSpec.Resources, SecurityContext: expectedEnvoySecurityContext(containerSpec), Ports: ports, @@ -190,7 +192,7 @@ func expectedProxyContainers(infra *ir.ProxyInfra, ImagePullPolicy: corev1.PullIfNotPresent, Command: []string{"envoy-gateway"}, Args: expectedShutdownManagerArgs(shutdownConfig), - Env: expectedContainerEnv(nil), + Env: expectedContainerEnv(infra, nil), Resources: *egv1a1.DefaultShutdownManagerContainerResourceRequirements(), TerminationMessagePolicy: corev1.TerminationMessageReadFile, TerminationMessagePath: "/dev/termination-log", @@ -400,7 +402,7 @@ func sdsConfigMapItems(gatewayNamespaceMode bool) []corev1.KeyToPath { } // expectedContainerEnv returns expected proxy container envs. -func expectedContainerEnv(containerSpec *egv1a1.KubernetesContainerSpec) []corev1.EnvVar { +func expectedContainerEnv(infra *ir.ProxyInfra, containerSpec *egv1a1.KubernetesContainerSpec) []corev1.EnvVar { env := []corev1.EnvVar{ { Name: envoyNsEnvVar, @@ -429,6 +431,10 @@ func expectedContainerEnv(containerSpec *egv1a1.KubernetesContainerSpec) []corev }, }, }, + { + Name: envoyInfraNameEnvVar, + Value: ExpectedResourceHashedName(infra.Name), + }, } if containerSpec != nil { diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/component-level.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/component-level.yaml index eb41b2ac52..88e697445e 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/component-level.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/component-level.yaml @@ -66,6 +66,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -153,6 +155,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml index 5a56810905..be9755e7d5 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml @@ -55,7 +55,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -132,7 +132,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -144,7 +144,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -232,6 +232,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: envoyproxy/envoy:v1.2.3 imagePullPolicy: IfNotPresent lifecycle: @@ -313,6 +315,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml index eb3cb2d11a..3eb3ae22cb 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -231,6 +231,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: envoyproxy/envoy:v1.2.3 imagePullPolicy: IfNotPresent lifecycle: @@ -312,6 +314,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml index 85493cc195..7e856fd824 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -216,6 +216,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -303,6 +305,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml index 5798d28861..19b0943985 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml @@ -50,7 +50,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -80,7 +80,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -92,7 +92,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -165,6 +165,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -249,6 +251,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml index 8da12ec97b..a1dc6b4f86 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -231,6 +231,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 - name: env_a value: env_a_value - name: env_b @@ -316,6 +318,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/gateway-namespace-mode.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/gateway-namespace-mode.yaml index 1886746441..129ee3f0a0 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/gateway-namespace-mode.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/gateway-namespace-mode.yaml @@ -57,7 +57,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -134,7 +134,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -146,7 +146,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -232,6 +232,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-gateway-1-e11eea07 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -322,6 +324,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-gateway-1-e11eea07 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml index 692f9b5b55..bd3aa21059 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml @@ -63,7 +63,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -140,7 +140,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -152,7 +152,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -225,6 +225,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -312,6 +314,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-prometheus-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-prometheus-annotations.yaml index 099d5a225e..d4a10d3e88 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-prometheus-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-prometheus-annotations.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -216,6 +216,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -303,6 +305,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml index 4059267689..846dc9c59f 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -216,6 +216,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -303,6 +305,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml index 78cc0b6b28..b71c949a30 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -216,6 +216,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -308,6 +310,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: envoyproxy/gateway-dev:v1.2.3 imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml index 78da341b7d..ab78a27cd1 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -231,6 +231,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 - name: env_a value: env_a_value - name: env_b @@ -316,6 +318,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml index f13e240054..fed862218e 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml @@ -59,7 +59,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -136,7 +136,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -148,7 +148,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -221,6 +221,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -308,6 +310,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-concurrency.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-concurrency.yaml index cee00906f7..8861bee8a3 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-concurrency.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-concurrency.yaml @@ -67,6 +67,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -154,6 +156,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml index 6395329313..13e85c4006 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -218,6 +218,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -305,6 +307,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml index d3bfde68a7..f6090591fb 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -216,6 +216,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -303,6 +305,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml index 72939b5755..9458bf718e 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -216,6 +216,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -303,6 +305,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml index 277bee2f37..e54bd32345 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -216,6 +216,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -303,6 +305,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml index 0a174dcbcf..30de81d67c 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -216,6 +216,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -303,6 +305,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/bootstrap.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/bootstrap.yaml index e22ab6b7b1..c7f5590f8d 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/bootstrap.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/bootstrap.yaml @@ -70,6 +70,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -157,6 +159,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/component-level.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/component-level.yaml index e66ddbdb54..363fafa370 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/component-level.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/component-level.yaml @@ -70,6 +70,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -157,6 +159,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom-sa.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom-sa.yaml index ecae105bc0..5594955d39 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom-sa.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom-sa.yaml @@ -61,7 +61,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -138,7 +138,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -150,7 +150,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -236,6 +236,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-gateway-1-e11eea07 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -326,6 +328,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-gateway-1-e11eea07 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml index e96b837aa4..1733685479 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml @@ -60,7 +60,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -137,7 +137,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -149,7 +149,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -237,6 +237,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: envoyproxy/envoy:v1.2.3 imagePullPolicy: IfNotPresent lifecycle: @@ -318,6 +320,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml index 0088db13c9..f5cd6666bc 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml @@ -60,7 +60,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -137,7 +137,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -149,7 +149,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -237,6 +237,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: envoyproxy/envoy:v1.2.3 imagePullPolicy: IfNotPresent lifecycle: @@ -320,6 +322,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml index 251f7fecfe..a1d6f43f03 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml @@ -59,7 +59,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -136,7 +136,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -148,7 +148,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -236,6 +236,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: envoyproxy/envoy:v1.2.3 imagePullPolicy: IfNotPresent lifecycle: @@ -317,6 +319,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml index 2d104ca9da..f9f429e4b9 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -220,6 +220,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -307,6 +309,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml index 0d988425b2..a5bbd8d144 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -84,7 +84,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -96,7 +96,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -169,6 +169,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -253,6 +255,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml index fa3d0304a2..bf9e979dd2 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -136,7 +136,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -148,7 +148,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -221,6 +221,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -308,6 +310,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml index 2ba927e8fc..aedb92cb22 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml @@ -59,7 +59,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -136,7 +136,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -148,7 +148,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -236,6 +236,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 - name: env_a value: env_a_value - name: env_b @@ -321,6 +323,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/gateway-namespace-mode.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/gateway-namespace-mode.yaml index abaa6eaa34..08c5d201c7 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/gateway-namespace-mode.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/gateway-namespace-mode.yaml @@ -61,7 +61,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -138,7 +138,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -150,7 +150,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -236,6 +236,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-gateway-1-e11eea07 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -326,6 +328,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-gateway-1-e11eea07 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml index 0b5f26b8ab..0cd678ed21 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml @@ -58,7 +58,7 @@ spec: address: ::1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -136,7 +136,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -148,7 +148,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -221,6 +221,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -308,6 +310,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml index fd8320a490..2334ea5800 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml @@ -67,7 +67,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -144,7 +144,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -156,7 +156,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -229,6 +229,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -316,6 +318,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-prometheus-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-prometheus-annotations.yaml index 7a7fe26c70..08870f098a 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-prometheus-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-prometheus-annotations.yaml @@ -60,7 +60,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -137,7 +137,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -149,7 +149,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -222,6 +222,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -309,6 +311,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml index 75b5c0466f..3be4b9716e 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -220,6 +220,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -307,6 +309,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml index 61098fcd53..be98c7abcf 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -220,6 +220,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -312,6 +314,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: privaterepo/envoyproxy/gateway-dev:v1.2.3 imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml index 57a77172e2..0edd453668 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml @@ -59,7 +59,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -136,7 +136,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -148,7 +148,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -236,6 +236,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 - name: env_a value: env_a_value - name: env_b @@ -321,6 +323,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml index 1e46ab65a6..00c16fb64a 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml @@ -63,7 +63,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -140,7 +140,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -152,7 +152,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -225,6 +225,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -312,6 +314,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-concurrency.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-concurrency.yaml index 21798b3bb9..8e763c2d0c 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-concurrency.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-concurrency.yaml @@ -71,6 +71,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -158,6 +160,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml index 8fddca291a..5b65b1b1e4 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -220,6 +220,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -306,6 +308,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml index b9f6849ae3..ec1862dc0f 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -222,6 +222,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -309,6 +311,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml index d40f50a442..afeb01ac68 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -220,6 +220,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -307,6 +309,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml index 5dcc3df825..ebd487d384 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -220,6 +220,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -307,6 +309,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml index ef27a5ff95..09024a7e29 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -220,6 +220,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -307,6 +309,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml index 6d81fc8463..81a181d17e 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -220,6 +220,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -307,6 +309,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/gateway-namespace-mode/deployment.yaml b/internal/infrastructure/kubernetes/proxy/testdata/gateway-namespace-mode/deployment.yaml index 8d1198c7e8..36daa7d227 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/gateway-namespace-mode/deployment.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/gateway-namespace-mode/deployment.yaml @@ -61,7 +61,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -138,7 +138,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -150,7 +150,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -236,6 +236,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-gateway-1-e11eea07 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -326,6 +328,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-gateway-1-e11eea07 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: @@ -475,7 +479,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -552,7 +556,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -564,7 +568,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: @@ -650,6 +654,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-gateway-2-159f3c5f image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -740,6 +746,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + - name: ENVOY_PROXY_INFRA_NAME + value: envoy-gateway-2-159f3c5f image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/xds/bootstrap/bootstrap.yaml.tpl b/internal/xds/bootstrap/bootstrap.yaml.tpl index c6956fe868..11f7d58261 100644 --- a/internal/xds/bootstrap/bootstrap.yaml.tpl +++ b/internal/xds/bootstrap/bootstrap.yaml.tpl @@ -9,7 +9,7 @@ admin: address: {{ .AdminServer.Address }} port_value: {{ .AdminServer.Port }} cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -174,7 +174,7 @@ static_resources: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -187,7 +187,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/testdata/merge/default.out.yaml b/internal/xds/bootstrap/testdata/merge/default.out.yaml index 6355da0d26..f5ef2e4199 100644 --- a/internal/xds/bootstrap/testdata/merge/default.out.yaml +++ b/internal/xds/bootstrap/testdata/merge/default.out.yaml @@ -9,7 +9,7 @@ admin: address: 127.0.0.1 portValue: 20000 clusterManager: - localClusterName: local_cluster + localClusterName: $(ENVOY_PROXY_INFRA_NAME) dynamicResources: adsConfig: apiType: DELTA_GRPC @@ -63,7 +63,7 @@ staticResources: type: STATIC - connectTimeout: 10s loadAssignment: - clusterName: local_cluster + clusterName: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lbEndpoints: - endpoint: @@ -75,7 +75,7 @@ staticResources: loadBalancingWeight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connectTimeout: 10s loadAssignment: diff --git a/internal/xds/bootstrap/testdata/merge/merge-user-bootstrap.out.yaml b/internal/xds/bootstrap/testdata/merge/merge-user-bootstrap.out.yaml index 7103c7405e..07de079bb0 100644 --- a/internal/xds/bootstrap/testdata/merge/merge-user-bootstrap.out.yaml +++ b/internal/xds/bootstrap/testdata/merge/merge-user-bootstrap.out.yaml @@ -9,7 +9,7 @@ admin: address: 127.0.0.1 portValue: 8080 clusterManager: - localClusterName: local_cluster + localClusterName: $(ENVOY_PROXY_INFRA_NAME) dynamicResources: adsConfig: apiType: DELTA_GRPC @@ -57,7 +57,7 @@ staticResources: type: STATIC - connectTimeout: 10s loadAssignment: - clusterName: local_cluster + clusterName: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lbEndpoints: - endpoint: @@ -69,7 +69,7 @@ staticResources: loadBalancingWeight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connectTimeout: 10s loadAssignment: diff --git a/internal/xds/bootstrap/testdata/merge/patch-global-config.out.yaml b/internal/xds/bootstrap/testdata/merge/patch-global-config.out.yaml index 95b6513157..525d97e62e 100644 --- a/internal/xds/bootstrap/testdata/merge/patch-global-config.out.yaml +++ b/internal/xds/bootstrap/testdata/merge/patch-global-config.out.yaml @@ -9,7 +9,7 @@ admin: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) dynamic_resources: ads_config: api_type: DELTA_GRPC @@ -60,7 +60,7 @@ static_resources: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -72,7 +72,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/testdata/merge/stats_sinks.out.yaml b/internal/xds/bootstrap/testdata/merge/stats_sinks.out.yaml index c9ab73ed73..4e7d447a4b 100644 --- a/internal/xds/bootstrap/testdata/merge/stats_sinks.out.yaml +++ b/internal/xds/bootstrap/testdata/merge/stats_sinks.out.yaml @@ -9,7 +9,7 @@ admin: address: 127.0.0.1 portValue: 19000 clusterManager: - localClusterName: local_cluster + localClusterName: $(ENVOY_PROXY_INFRA_NAME) dynamicResources: adsConfig: apiType: DELTA_GRPC @@ -57,7 +57,7 @@ staticResources: type: STATIC - connectTimeout: 10s loadAssignment: - clusterName: local_cluster + clusterName: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lbEndpoints: - endpoint: @@ -69,7 +69,7 @@ staticResources: loadBalancingWeight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connectTimeout: 10s loadAssignment: diff --git a/internal/xds/bootstrap/testdata/render/custom-server-port.yaml b/internal/xds/bootstrap/testdata/render/custom-server-port.yaml index 94586a1f0a..2db50957fd 100644 --- a/internal/xds/bootstrap/testdata/render/custom-server-port.yaml +++ b/internal/xds/bootstrap/testdata/render/custom-server-port.yaml @@ -9,7 +9,7 @@ admin: address: 127.0.0.1 port_value: 2222 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -86,7 +86,7 @@ static_resources: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -98,7 +98,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/testdata/render/custom-stats-matcher.yaml b/internal/xds/bootstrap/testdata/render/custom-stats-matcher.yaml index a0cef5eb66..713a7fe607 100644 --- a/internal/xds/bootstrap/testdata/render/custom-stats-matcher.yaml +++ b/internal/xds/bootstrap/testdata/render/custom-stats-matcher.yaml @@ -9,7 +9,7 @@ admin: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -97,7 +97,7 @@ static_resources: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -109,7 +109,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/testdata/render/disable-prometheus.yaml b/internal/xds/bootstrap/testdata/render/disable-prometheus.yaml index 00f493acc1..4a208968e3 100644 --- a/internal/xds/bootstrap/testdata/render/disable-prometheus.yaml +++ b/internal/xds/bootstrap/testdata/render/disable-prometheus.yaml @@ -9,7 +9,7 @@ admin: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -39,7 +39,7 @@ static_resources: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -51,7 +51,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/testdata/render/enable-prometheus-brotli-compression.yaml b/internal/xds/bootstrap/testdata/render/enable-prometheus-brotli-compression.yaml index 936b6b5204..c2dcfec86e 100644 --- a/internal/xds/bootstrap/testdata/render/enable-prometheus-brotli-compression.yaml +++ b/internal/xds/bootstrap/testdata/render/enable-prometheus-brotli-compression.yaml @@ -9,7 +9,7 @@ admin: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -102,7 +102,7 @@ static_resources: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -114,7 +114,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/testdata/render/enable-prometheus-gzip-compression.yaml b/internal/xds/bootstrap/testdata/render/enable-prometheus-gzip-compression.yaml index b4e898497e..b403d141c8 100644 --- a/internal/xds/bootstrap/testdata/render/enable-prometheus-gzip-compression.yaml +++ b/internal/xds/bootstrap/testdata/render/enable-prometheus-gzip-compression.yaml @@ -9,7 +9,7 @@ admin: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -102,7 +102,7 @@ static_resources: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -114,7 +114,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/testdata/render/enable-prometheus.yaml b/internal/xds/bootstrap/testdata/render/enable-prometheus.yaml index a974728e63..cb72585b1f 100644 --- a/internal/xds/bootstrap/testdata/render/enable-prometheus.yaml +++ b/internal/xds/bootstrap/testdata/render/enable-prometheus.yaml @@ -9,7 +9,7 @@ admin: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -86,7 +86,7 @@ static_resources: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -98,7 +98,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/testdata/render/ipv6.yaml b/internal/xds/bootstrap/testdata/render/ipv6.yaml index ce56cc6abd..5034bac754 100644 --- a/internal/xds/bootstrap/testdata/render/ipv6.yaml +++ b/internal/xds/bootstrap/testdata/render/ipv6.yaml @@ -9,7 +9,7 @@ admin: address: ::1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -87,7 +87,7 @@ static_resources: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -99,7 +99,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/testdata/render/otel-metrics-backendref.yaml b/internal/xds/bootstrap/testdata/render/otel-metrics-backendref.yaml index b3b2f9b534..fceec2964a 100644 --- a/internal/xds/bootstrap/testdata/render/otel-metrics-backendref.yaml +++ b/internal/xds/bootstrap/testdata/render/otel-metrics-backendref.yaml @@ -9,7 +9,7 @@ admin: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -64,7 +64,7 @@ static_resources: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -76,7 +76,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/testdata/render/otel-metrics.yaml b/internal/xds/bootstrap/testdata/render/otel-metrics.yaml index b3b2f9b534..fceec2964a 100644 --- a/internal/xds/bootstrap/testdata/render/otel-metrics.yaml +++ b/internal/xds/bootstrap/testdata/render/otel-metrics.yaml @@ -9,7 +9,7 @@ admin: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -64,7 +64,7 @@ static_resources: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -76,7 +76,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/testdata/render/with-max-heap-size-bytes.yaml b/internal/xds/bootstrap/testdata/render/with-max-heap-size-bytes.yaml index 33b2a460c2..eb50d2ed30 100644 --- a/internal/xds/bootstrap/testdata/render/with-max-heap-size-bytes.yaml +++ b/internal/xds/bootstrap/testdata/render/with-max-heap-size-bytes.yaml @@ -9,7 +9,7 @@ admin: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: local_cluster + local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -86,7 +86,7 @@ static_resources: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: local_cluster + cluster_name: $(ENVOY_PROXY_INFRA_NAME) endpoints: - lb_endpoints: - endpoint: @@ -98,7 +98,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: $(ENVOY_PROXY_INFRA_NAME) type: STATIC - connect_timeout: 10s load_assignment: From ee50fbd58c7175d8415fb6fb3514ffc8eab40af8 Mon Sep 17 00:00:00 2001 From: jukie <10012479+Jukie@users.noreply.github.com> Date: Thu, 24 Jul 2025 09:15:42 -0600 Subject: [PATCH 2/6] Pass as bootstrap value Signed-off-by: jukie <10012479+Jukie@users.noreply.github.com> --- .../translate/out/default-resources.all.yaml | 12 +++++------ .../out/from-gateway-api-to-xds.all.json | 6 +++--- .../out/from-gateway-api-to-xds.all.yaml | 6 +++--- .../from-gateway-api-to-xds.bootstrap.yaml | 6 +++--- ...-single-route-single-match-to-xds.all.json | 6 +++--- ...-single-route-single-match-to-xds.all.yaml | 6 +++--- ...e-route-single-match-to-xds.bootstrap.yaml | 6 +++--- .../out/no-service-cluster-ip.all.yaml | 6 +++--- internal/infrastructure/host/proxy_infra.go | 2 ++ .../kubernetes/proxy/resource.go | 13 ++++-------- .../testdata/daemonsets/component-level.yaml | 4 ---- .../proxy/testdata/daemonsets/custom.yaml | 10 +++------- .../testdata/daemonsets/default-env.yaml | 10 +++------- .../proxy/testdata/daemonsets/default.yaml | 10 +++------- .../daemonsets/disable-prometheus.yaml | 10 +++------- .../testdata/daemonsets/extension-env.yaml | 10 +++------- .../daemonsets/gateway-namespace-mode.yaml | 10 +++------- .../override-labels-and-annotations.yaml | 10 +++------- .../override-prometheus-annotations.yaml | 10 +++------- .../testdata/daemonsets/patch-daemonset.yaml | 10 +++------- .../testdata/daemonsets/shutdown-manager.yaml | 10 +++------- .../proxy/testdata/daemonsets/volumes.yaml | 10 +++------- .../testdata/daemonsets/with-annotations.yaml | 10 +++------- .../testdata/daemonsets/with-concurrency.yaml | 4 ---- .../testdata/daemonsets/with-extra-args.yaml | 10 +++------- .../daemonsets/with-image-pull-secrets.yaml | 10 +++------- .../proxy/testdata/daemonsets/with-name.yaml | 10 +++------- .../daemonsets/with-node-selector.yaml | 10 +++------- .../with-topology-spread-constraints.yaml | 10 +++------- .../proxy/testdata/deployments/bootstrap.yaml | 4 ---- .../testdata/deployments/component-level.yaml | 4 ---- .../proxy/testdata/deployments/custom-sa.yaml | 10 +++------- .../proxy/testdata/deployments/custom.yaml | 10 +++------- .../custom_with_initcontainers.yaml | 10 +++------- .../testdata/deployments/default-env.yaml | 10 +++------- .../proxy/testdata/deployments/default.yaml | 10 +++------- .../deployments/disable-prometheus.yaml | 10 +++------- .../testdata/deployments/dual-stack.yaml | 10 +++------- .../testdata/deployments/extension-env.yaml | 10 +++------- .../deployments/gateway-namespace-mode.yaml | 10 +++------- .../proxy/testdata/deployments/ipv6.yaml | 10 +++------- .../override-labels-and-annotations.yaml | 10 +++------- .../override-prometheus-annotations.yaml | 10 +++------- .../deployments/patch-deployment.yaml | 10 +++------- .../deployments/shutdown-manager.yaml | 10 +++------- .../proxy/testdata/deployments/volumes.yaml | 10 +++------- .../deployments/with-annotations.yaml | 10 +++------- .../deployments/with-concurrency.yaml | 4 ---- .../deployments/with-empty-memory-limits.yaml | 10 +++------- .../testdata/deployments/with-extra-args.yaml | 10 +++------- .../deployments/with-image-pull-secrets.yaml | 10 +++------- .../proxy/testdata/deployments/with-name.yaml | 10 +++------- .../deployments/with-node-selector.yaml | 10 +++------- .../with-topology-spread-constraints.yaml | 10 +++------- .../gateway-namespace-mode/deployment.yaml | 20 ++++++------------- internal/xds/bootstrap/bootstrap.go | 9 +++++++++ internal/xds/bootstrap/bootstrap.yaml.tpl | 6 +++--- .../bootstrap/testdata/merge/default.out.yaml | 6 +++--- .../merge/merge-user-bootstrap.out.yaml | 6 +++--- .../merge/patch-global-config.out.yaml | 6 +++--- .../testdata/merge/stats_sinks.out.yaml | 6 +++--- .../testdata/render/custom-server-port.yaml | 6 +++--- .../testdata/render/custom-stats-matcher.yaml | 6 +++--- .../testdata/render/disable-prometheus.yaml | 6 +++--- .../enable-prometheus-brotli-compression.yaml | 6 +++--- .../enable-prometheus-gzip-compression.yaml | 6 +++--- .../testdata/render/enable-prometheus.yaml | 6 +++--- .../xds/bootstrap/testdata/render/ipv6.yaml | 6 +++--- .../render/otel-metrics-backendref.yaml | 6 +++--- .../testdata/render/otel-metrics.yaml | 6 +++--- .../render/with-max-heap-size-bytes.yaml | 6 +++--- 71 files changed, 210 insertions(+), 388 deletions(-) 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 4873277e36..31b11eb1af 100644 --- a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml @@ -20,7 +20,7 @@ envoyProxyForGatewayClass: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: local_cluster node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -97,7 +97,7 @@ envoyProxyForGatewayClass: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: local_cluster endpoints: - lb_endpoints: - endpoint: @@ -109,7 +109,7 @@ envoyProxyForGatewayClass: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: local_cluster type: STATIC - connect_timeout: 10s load_assignment: @@ -560,7 +560,7 @@ xds: address: 127.0.0.1 portValue: 19000 clusterManager: - localClusterName: $(ENVOY_PROXY_INFRA_NAME) + localClusterName: local_cluster dynamicResources: adsConfig: apiType: DELTA_GRPC @@ -608,7 +608,7 @@ xds: type: STATIC - connectTimeout: 10s loadAssignment: - clusterName: $(ENVOY_PROXY_INFRA_NAME) + clusterName: local_cluster endpoints: - lbEndpoints: - endpoint: @@ -620,7 +620,7 @@ xds: loadBalancingWeight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: local_cluster type: STATIC - connectTimeout: 10s loadAssignment: 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 d263b398ee..b592bd3e6a 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 @@ -23,7 +23,7 @@ } }, "clusterManager": { - "localClusterName": "$(ENVOY_PROXY_INFRA_NAME)" + "localClusterName": "local_cluster" }, "dynamicResources": { "adsConfig": { @@ -105,7 +105,7 @@ { "connectTimeout": "10s", "loadAssignment": { - "clusterName": "$(ENVOY_PROXY_INFRA_NAME)", + "clusterName": "local_cluster", "endpoints": [ { "lbEndpoints": [ @@ -128,7 +128,7 @@ } ] }, - "name": "$(ENVOY_PROXY_INFRA_NAME)", + "name": "local_cluster", "type": "STATIC" }, { 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 2944fd5e6b..0ce878805f 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 @@ -14,7 +14,7 @@ xds: address: 127.0.0.1 portValue: 19000 clusterManager: - localClusterName: $(ENVOY_PROXY_INFRA_NAME) + localClusterName: local_cluster dynamicResources: adsConfig: apiType: DELTA_GRPC @@ -62,7 +62,7 @@ xds: type: STATIC - connectTimeout: 10s loadAssignment: - clusterName: $(ENVOY_PROXY_INFRA_NAME) + clusterName: local_cluster endpoints: - lbEndpoints: - endpoint: @@ -74,7 +74,7 @@ xds: loadBalancingWeight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: local_cluster type: STATIC - connectTimeout: 10s loadAssignment: diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.bootstrap.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.bootstrap.yaml index 69f6a20043..6dcc5612c9 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.bootstrap.yaml +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.bootstrap.yaml @@ -13,7 +13,7 @@ xds: address: 127.0.0.1 portValue: 19000 clusterManager: - localClusterName: $(ENVOY_PROXY_INFRA_NAME) + localClusterName: local_cluster dynamicResources: adsConfig: apiType: DELTA_GRPC @@ -61,7 +61,7 @@ xds: type: STATIC - connectTimeout: 10s loadAssignment: - clusterName: $(ENVOY_PROXY_INFRA_NAME) + clusterName: local_cluster endpoints: - lbEndpoints: - endpoint: @@ -73,7 +73,7 @@ xds: loadBalancingWeight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: local_cluster type: STATIC - connectTimeout: 10s loadAssignment: 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 d1cb8e97eb..c696b07001 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 @@ -23,7 +23,7 @@ } }, "clusterManager": { - "localClusterName": "$(ENVOY_PROXY_INFRA_NAME)" + "localClusterName": "local_cluster" }, "dynamicResources": { "adsConfig": { @@ -105,7 +105,7 @@ { "connectTimeout": "10s", "loadAssignment": { - "clusterName": "$(ENVOY_PROXY_INFRA_NAME)", + "clusterName": "local_cluster", "endpoints": [ { "lbEndpoints": [ @@ -128,7 +128,7 @@ } ] }, - "name": "$(ENVOY_PROXY_INFRA_NAME)", + "name": "local_cluster", "type": "STATIC" }, { 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 6584003724..7c62e33666 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 @@ -14,7 +14,7 @@ xds: address: 127.0.0.1 portValue: 19000 clusterManager: - localClusterName: $(ENVOY_PROXY_INFRA_NAME) + localClusterName: local_cluster dynamicResources: adsConfig: apiType: DELTA_GRPC @@ -62,7 +62,7 @@ xds: type: STATIC - connectTimeout: 10s loadAssignment: - clusterName: $(ENVOY_PROXY_INFRA_NAME) + clusterName: local_cluster endpoints: - lbEndpoints: - endpoint: @@ -74,7 +74,7 @@ xds: loadBalancingWeight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: local_cluster type: STATIC - connectTimeout: 10s loadAssignment: diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.bootstrap.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.bootstrap.yaml index 7f520a2d4d..c7675ded8b 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.bootstrap.yaml +++ b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.bootstrap.yaml @@ -13,7 +13,7 @@ xds: address: 127.0.0.1 portValue: 19000 clusterManager: - localClusterName: $(ENVOY_PROXY_INFRA_NAME) + localClusterName: local_cluster dynamicResources: adsConfig: apiType: DELTA_GRPC @@ -61,7 +61,7 @@ xds: type: STATIC - connectTimeout: 10s loadAssignment: - clusterName: $(ENVOY_PROXY_INFRA_NAME) + clusterName: local_cluster endpoints: - lbEndpoints: - endpoint: @@ -73,7 +73,7 @@ xds: loadBalancingWeight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: local_cluster type: STATIC - connectTimeout: 10s loadAssignment: diff --git a/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml b/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml index 8ff55fb199..0553585ed2 100644 --- a/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml @@ -14,7 +14,7 @@ xds: address: 127.0.0.1 portValue: 19000 clusterManager: - localClusterName: $(ENVOY_PROXY_INFRA_NAME) + localClusterName: local_cluster dynamicResources: adsConfig: apiType: DELTA_GRPC @@ -62,7 +62,7 @@ xds: type: STATIC - connectTimeout: 10s loadAssignment: - clusterName: $(ENVOY_PROXY_INFRA_NAME) + clusterName: local_cluster endpoints: - lbEndpoints: - endpoint: @@ -74,7 +74,7 @@ xds: loadBalancingWeight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: local_cluster type: STATIC - connectTimeout: 10s loadAssignment: diff --git a/internal/infrastructure/host/proxy_infra.go b/internal/infrastructure/host/proxy_infra.go index 229fdcd1c3..6b19181b29 100644 --- a/internal/infrastructure/host/proxy_infra.go +++ b/internal/infrastructure/host/proxy_infra.go @@ -8,6 +8,7 @@ package host import ( "context" "errors" + "github.com/envoyproxy/gateway/internal/infrastructure/kubernetes/proxy" "io" "os" "path/filepath" @@ -72,6 +73,7 @@ func (i *Infra) CreateOrUpdateProxyInfra(ctx context.Context, infra *ir.Infra) e XdsServerHost: ptr.To("0.0.0.0"), AdminServerPort: ptr.To(int32(0)), StatsServerPort: ptr.To(int32(0)), + ProxyInfraName: ptr.To(proxy.ExpectedResourceHashedName(proxyInfra.Name)), } args, err := common.BuildProxyArgs(proxyInfra, proxyConfig.Spec.Shutdown, bootstrapConfigOptions, proxyName, false) diff --git a/internal/infrastructure/kubernetes/proxy/resource.go b/internal/infrastructure/kubernetes/proxy/resource.go index b5bf61aa11..10b5feaad5 100644 --- a/internal/infrastructure/kubernetes/proxy/resource.go +++ b/internal/infrastructure/kubernetes/proxy/resource.go @@ -33,8 +33,6 @@ const ( envoyPodEnvVar = "ENVOY_POD_NAME" // envoyZoneEnvVar is the Envoy pod locality zone name envoyZoneEnvVar = "ENVOY_SERVICE_ZONE" - // envoyInfraNameEnvVar is the name of the envoy proxy infrastructure - envoyInfraNameEnvVar = "ENVOY_PROXY_INFRA_NAME" ) // ExpectedResourceHashedName returns expected resource hashed name including up to the 48 characters of the original name. @@ -111,6 +109,7 @@ func expectedProxyContainers(infra *ir.ProxyInfra, }, MaxHeapSizeBytes: maxHeapSizeBytes, XdsServerHost: ptr.To(fmt.Sprintf("%s.%s.svc.%s", config.EnvoyGatewayServiceName, controllerNamespace, dnsDomain)), + ProxyInfraName: ptr.To(ExpectedResourceHashedName(infra.Name)), } args, err := common.BuildProxyArgs(infra, shutdownConfig, bootstrapConfigOptions, fmt.Sprintf("$(%s)", envoyPodEnvVar), gatewayNamespaceMode) @@ -130,7 +129,7 @@ func expectedProxyContainers(infra *ir.ProxyInfra, ImagePullPolicy: corev1.PullIfNotPresent, Command: []string{"envoy"}, Args: args, - Env: expectedContainerEnv(infra, containerSpec), + Env: expectedContainerEnv(containerSpec), Resources: *containerSpec.Resources, SecurityContext: expectedEnvoySecurityContext(containerSpec), Ports: ports, @@ -192,7 +191,7 @@ func expectedProxyContainers(infra *ir.ProxyInfra, ImagePullPolicy: corev1.PullIfNotPresent, Command: []string{"envoy-gateway"}, Args: expectedShutdownManagerArgs(shutdownConfig), - Env: expectedContainerEnv(infra, nil), + Env: expectedContainerEnv(nil), Resources: *egv1a1.DefaultShutdownManagerContainerResourceRequirements(), TerminationMessagePolicy: corev1.TerminationMessageReadFile, TerminationMessagePath: "/dev/termination-log", @@ -402,7 +401,7 @@ func sdsConfigMapItems(gatewayNamespaceMode bool) []corev1.KeyToPath { } // expectedContainerEnv returns expected proxy container envs. -func expectedContainerEnv(infra *ir.ProxyInfra, containerSpec *egv1a1.KubernetesContainerSpec) []corev1.EnvVar { +func expectedContainerEnv(containerSpec *egv1a1.KubernetesContainerSpec) []corev1.EnvVar { env := []corev1.EnvVar{ { Name: envoyNsEnvVar, @@ -431,10 +430,6 @@ func expectedContainerEnv(infra *ir.ProxyInfra, containerSpec *egv1a1.Kubernetes }, }, }, - { - Name: envoyInfraNameEnvVar, - Value: ExpectedResourceHashedName(infra.Name), - }, } if containerSpec != nil { diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/component-level.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/component-level.yaml index 88e697445e..eb41b2ac52 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/component-level.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/component-level.yaml @@ -66,8 +66,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -155,8 +153,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml index be9755e7d5..23db3376b4 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml @@ -55,7 +55,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -132,7 +132,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -144,7 +144,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -232,8 +232,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: envoyproxy/envoy:v1.2.3 imagePullPolicy: IfNotPresent lifecycle: @@ -315,8 +313,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml index 3eb3ae22cb..a79f3610fa 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -231,8 +231,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: envoyproxy/envoy:v1.2.3 imagePullPolicy: IfNotPresent lifecycle: @@ -314,8 +312,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml index 7e856fd824..082ded95e2 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -216,8 +216,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -305,8 +303,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml index 19b0943985..6bbb3b6d13 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml @@ -50,7 +50,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -80,7 +80,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -92,7 +92,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -165,8 +165,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -251,8 +249,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml index a1dc6b4f86..8cd6c07dc4 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -231,8 +231,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 - name: env_a value: env_a_value - name: env_b @@ -318,8 +316,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/gateway-namespace-mode.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/gateway-namespace-mode.yaml index 129ee3f0a0..51030311a9 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/gateway-namespace-mode.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/gateway-namespace-mode.yaml @@ -57,7 +57,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-gateway-1-e11eea07 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -134,7 +134,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-gateway-1-e11eea07 endpoints: - lb_endpoints: - endpoint: @@ -146,7 +146,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-gateway-1-e11eea07 type: STATIC - connect_timeout: 10s load_assignment: @@ -232,8 +232,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-gateway-1-e11eea07 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -324,8 +322,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-gateway-1-e11eea07 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml index bd3aa21059..0f881a4ea8 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml @@ -63,7 +63,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -140,7 +140,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -152,7 +152,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -225,8 +225,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -314,8 +312,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-prometheus-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-prometheus-annotations.yaml index d4a10d3e88..b1301f84d7 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-prometheus-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-prometheus-annotations.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -216,8 +216,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -305,8 +303,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml index 846dc9c59f..302614fce8 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -216,8 +216,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -305,8 +303,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml index b71c949a30..47184a2621 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -216,8 +216,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -310,8 +308,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: envoyproxy/gateway-dev:v1.2.3 imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml index ab78a27cd1..8def0b3adc 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -231,8 +231,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 - name: env_a value: env_a_value - name: env_b @@ -318,8 +316,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml index fed862218e..2202323ab2 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml @@ -59,7 +59,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -136,7 +136,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -148,7 +148,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -221,8 +221,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -310,8 +308,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-concurrency.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-concurrency.yaml index 8861bee8a3..cee00906f7 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-concurrency.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-concurrency.yaml @@ -67,8 +67,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -156,8 +154,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml index 13e85c4006..30e8db56ba 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -218,8 +218,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -307,8 +305,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml index f6090591fb..96b1e5969e 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -216,8 +216,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -305,8 +303,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml index 9458bf718e..bb4e942c58 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -216,8 +216,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -305,8 +303,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml index e54bd32345..42e91f57d6 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -216,8 +216,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -305,8 +303,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml index 30de81d67c..5dda8dbd5c 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -216,8 +216,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -305,8 +303,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/bootstrap.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/bootstrap.yaml index c7f5590f8d..e22ab6b7b1 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/bootstrap.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/bootstrap.yaml @@ -70,8 +70,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -159,8 +157,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/component-level.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/component-level.yaml index 363fafa370..e66ddbdb54 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/component-level.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/component-level.yaml @@ -70,8 +70,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -159,8 +157,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom-sa.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom-sa.yaml index 5594955d39..1d0edd0b0c 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom-sa.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom-sa.yaml @@ -61,7 +61,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-gateway-1-e11eea07 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -138,7 +138,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-gateway-1-e11eea07 endpoints: - lb_endpoints: - endpoint: @@ -150,7 +150,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-gateway-1-e11eea07 type: STATIC - connect_timeout: 10s load_assignment: @@ -236,8 +236,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-gateway-1-e11eea07 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -328,8 +326,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-gateway-1-e11eea07 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml index 1733685479..65da563ce7 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml @@ -60,7 +60,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -137,7 +137,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -149,7 +149,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -237,8 +237,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: envoyproxy/envoy:v1.2.3 imagePullPolicy: IfNotPresent lifecycle: @@ -320,8 +318,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml index f5cd6666bc..165f6f9538 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml @@ -60,7 +60,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -137,7 +137,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -149,7 +149,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -237,8 +237,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: envoyproxy/envoy:v1.2.3 imagePullPolicy: IfNotPresent lifecycle: @@ -322,8 +320,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml index a1d6f43f03..c4186bf8fc 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml @@ -59,7 +59,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -136,7 +136,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -148,7 +148,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -236,8 +236,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: envoyproxy/envoy:v1.2.3 imagePullPolicy: IfNotPresent lifecycle: @@ -319,8 +317,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml index f9f429e4b9..2793bc5297 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -220,8 +220,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -309,8 +307,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml index a5bbd8d144..ed289bd60c 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -84,7 +84,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -96,7 +96,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -169,8 +169,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -255,8 +253,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml index bf9e979dd2..c1d69ba34a 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -136,7 +136,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -148,7 +148,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -221,8 +221,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -310,8 +308,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml index aedb92cb22..642bbf9c2b 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml @@ -59,7 +59,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -136,7 +136,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -148,7 +148,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -236,8 +236,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 - name: env_a value: env_a_value - name: env_b @@ -323,8 +321,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/gateway-namespace-mode.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/gateway-namespace-mode.yaml index 08c5d201c7..aa34464165 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/gateway-namespace-mode.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/gateway-namespace-mode.yaml @@ -61,7 +61,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-gateway-1-e11eea07 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -138,7 +138,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-gateway-1-e11eea07 endpoints: - lb_endpoints: - endpoint: @@ -150,7 +150,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-gateway-1-e11eea07 type: STATIC - connect_timeout: 10s load_assignment: @@ -236,8 +236,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-gateway-1-e11eea07 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -328,8 +326,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-gateway-1-e11eea07 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml index 0cd678ed21..391ab05f6c 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml @@ -58,7 +58,7 @@ spec: address: ::1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -136,7 +136,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -148,7 +148,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -221,8 +221,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -310,8 +308,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml index 2334ea5800..eac68f5eeb 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml @@ -67,7 +67,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -144,7 +144,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -156,7 +156,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -229,8 +229,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -318,8 +316,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-prometheus-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-prometheus-annotations.yaml index 08870f098a..8ead8ba255 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-prometheus-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-prometheus-annotations.yaml @@ -60,7 +60,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -137,7 +137,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -149,7 +149,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -222,8 +222,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -311,8 +309,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml index 3be4b9716e..f59ffc9743 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -220,8 +220,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -309,8 +307,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml index be98c7abcf..baede75046 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -220,8 +220,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -314,8 +312,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: privaterepo/envoyproxy/gateway-dev:v1.2.3 imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml index 0edd453668..21a146fc78 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml @@ -59,7 +59,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -136,7 +136,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -148,7 +148,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -236,8 +236,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 - name: env_a value: env_a_value - name: env_b @@ -323,8 +321,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml index 00c16fb64a..8fd790ac0c 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml @@ -63,7 +63,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -140,7 +140,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -152,7 +152,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -225,8 +225,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -314,8 +312,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-concurrency.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-concurrency.yaml index 8e763c2d0c..21798b3bb9 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-concurrency.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-concurrency.yaml @@ -71,8 +71,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -160,8 +158,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml index 5b65b1b1e4..1d7272d654 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -220,8 +220,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -308,8 +306,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml index ec1862dc0f..fd08338646 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -222,8 +222,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -311,8 +309,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml index afeb01ac68..536161b04a 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -220,8 +220,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -309,8 +307,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml index ebd487d384..834d414044 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -220,8 +220,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -309,8 +307,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml index 09024a7e29..0a1df668f2 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -220,8 +220,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -309,8 +307,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml index 81a181d17e..3becc22385 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-default-37a8eec1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-default-37a8eec1 endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-default-37a8eec1 type: STATIC - connect_timeout: 10s load_assignment: @@ -220,8 +220,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -309,8 +307,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-default-37a8eec1 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/gateway-namespace-mode/deployment.yaml b/internal/infrastructure/kubernetes/proxy/testdata/gateway-namespace-mode/deployment.yaml index 36daa7d227..5111374986 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/gateway-namespace-mode/deployment.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/gateway-namespace-mode/deployment.yaml @@ -61,7 +61,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-gateway-1-e11eea07 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -138,7 +138,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-gateway-1-e11eea07 endpoints: - lb_endpoints: - endpoint: @@ -150,7 +150,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-gateway-1-e11eea07 type: STATIC - connect_timeout: 10s load_assignment: @@ -236,8 +236,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-gateway-1-e11eea07 image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -328,8 +326,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-gateway-1-e11eea07 image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: @@ -479,7 +475,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: envoy-gateway-2-159f3c5f node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -556,7 +552,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: envoy-gateway-2-159f3c5f endpoints: - lb_endpoints: - endpoint: @@ -568,7 +564,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: envoy-gateway-2-159f3c5f type: STATIC - connect_timeout: 10s load_assignment: @@ -654,8 +650,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-gateway-2-159f3c5f image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -746,8 +740,6 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - - name: ENVOY_PROXY_INFRA_NAME - value: envoy-gateway-2-159f3c5f image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/xds/bootstrap/bootstrap.go b/internal/xds/bootstrap/bootstrap.go index 27fc7b4a2c..a6fff52475 100644 --- a/internal/xds/bootstrap/bootstrap.go +++ b/internal/xds/bootstrap/bootstrap.go @@ -45,6 +45,8 @@ const ( defaultSdsTrustedCAPath = "/sds/xds-trusted-ca.json" defaultSdsCertificatePath = "/sds/xds-certificate.json" + + defaultLocalClusterName = "local_cluster" ) //go:embed bootstrap.yaml.tpl @@ -95,6 +97,8 @@ type bootstrapParameters struct { IPFamily string // GatewayNamespaceMode defines whether to use the Envoy Gateway namespace mode. GatewayNamespaceMode bool + // ProxyInfraName is the name of the ProxyInfra and used as the internal local_cluster name. + ProxyInfraName string } type serverParameters struct { @@ -135,6 +139,7 @@ type RenderBootstrapConfigOptions struct { IPFamily *egv1a1.IPFamily ProxyMetrics *egv1a1.ProxyMetrics SdsConfig SdsConfigPath + ProxyInfraName *string XdsServerHost *string XdsServerPort *int32 AdminServerPort *int32 @@ -254,6 +259,7 @@ func GetRenderedBootstrapConfig(opts *RenderBootstrapConfigOptions) (string, err EnablePrometheusCompression: enablePrometheusCompression, PrometheusCompressionLibrary: prometheusCompressionLibrary, OtelMetricSinks: metricSinks, + ProxyInfraName: defaultLocalClusterName, }, } @@ -298,6 +304,9 @@ func GetRenderedBootstrapConfig(opts *RenderBootstrapConfigOptions) (string, err } cfg.parameters.GatewayNamespaceMode = opts.GatewayNamespaceMode cfg.parameters.OverloadManager.MaxHeapSizeBytes = opts.MaxHeapSizeBytes + if opts.ProxyInfraName != nil { + cfg.parameters.ProxyInfraName = *opts.ProxyInfraName + } } if err := cfg.render(); err != nil { diff --git a/internal/xds/bootstrap/bootstrap.yaml.tpl b/internal/xds/bootstrap/bootstrap.yaml.tpl index 11f7d58261..034b3dcc64 100644 --- a/internal/xds/bootstrap/bootstrap.yaml.tpl +++ b/internal/xds/bootstrap/bootstrap.yaml.tpl @@ -9,7 +9,7 @@ admin: address: {{ .AdminServer.Address }} port_value: {{ .AdminServer.Port }} cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: {{ .ProxyInfraName }} node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -174,7 +174,7 @@ static_resources: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: {{ .ProxyInfraName }} endpoints: - lb_endpoints: - endpoint: @@ -187,7 +187,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: {{ .ProxyInfraName }} type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/testdata/merge/default.out.yaml b/internal/xds/bootstrap/testdata/merge/default.out.yaml index f5ef2e4199..6355da0d26 100644 --- a/internal/xds/bootstrap/testdata/merge/default.out.yaml +++ b/internal/xds/bootstrap/testdata/merge/default.out.yaml @@ -9,7 +9,7 @@ admin: address: 127.0.0.1 portValue: 20000 clusterManager: - localClusterName: $(ENVOY_PROXY_INFRA_NAME) + localClusterName: local_cluster dynamicResources: adsConfig: apiType: DELTA_GRPC @@ -63,7 +63,7 @@ staticResources: type: STATIC - connectTimeout: 10s loadAssignment: - clusterName: $(ENVOY_PROXY_INFRA_NAME) + clusterName: local_cluster endpoints: - lbEndpoints: - endpoint: @@ -75,7 +75,7 @@ staticResources: loadBalancingWeight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: local_cluster type: STATIC - connectTimeout: 10s loadAssignment: diff --git a/internal/xds/bootstrap/testdata/merge/merge-user-bootstrap.out.yaml b/internal/xds/bootstrap/testdata/merge/merge-user-bootstrap.out.yaml index 07de079bb0..7103c7405e 100644 --- a/internal/xds/bootstrap/testdata/merge/merge-user-bootstrap.out.yaml +++ b/internal/xds/bootstrap/testdata/merge/merge-user-bootstrap.out.yaml @@ -9,7 +9,7 @@ admin: address: 127.0.0.1 portValue: 8080 clusterManager: - localClusterName: $(ENVOY_PROXY_INFRA_NAME) + localClusterName: local_cluster dynamicResources: adsConfig: apiType: DELTA_GRPC @@ -57,7 +57,7 @@ staticResources: type: STATIC - connectTimeout: 10s loadAssignment: - clusterName: $(ENVOY_PROXY_INFRA_NAME) + clusterName: local_cluster endpoints: - lbEndpoints: - endpoint: @@ -69,7 +69,7 @@ staticResources: loadBalancingWeight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: local_cluster type: STATIC - connectTimeout: 10s loadAssignment: diff --git a/internal/xds/bootstrap/testdata/merge/patch-global-config.out.yaml b/internal/xds/bootstrap/testdata/merge/patch-global-config.out.yaml index 525d97e62e..95b6513157 100644 --- a/internal/xds/bootstrap/testdata/merge/patch-global-config.out.yaml +++ b/internal/xds/bootstrap/testdata/merge/patch-global-config.out.yaml @@ -9,7 +9,7 @@ admin: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: local_cluster dynamic_resources: ads_config: api_type: DELTA_GRPC @@ -60,7 +60,7 @@ static_resources: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: local_cluster endpoints: - lb_endpoints: - endpoint: @@ -72,7 +72,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: local_cluster type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/testdata/merge/stats_sinks.out.yaml b/internal/xds/bootstrap/testdata/merge/stats_sinks.out.yaml index 4e7d447a4b..c9ab73ed73 100644 --- a/internal/xds/bootstrap/testdata/merge/stats_sinks.out.yaml +++ b/internal/xds/bootstrap/testdata/merge/stats_sinks.out.yaml @@ -9,7 +9,7 @@ admin: address: 127.0.0.1 portValue: 19000 clusterManager: - localClusterName: $(ENVOY_PROXY_INFRA_NAME) + localClusterName: local_cluster dynamicResources: adsConfig: apiType: DELTA_GRPC @@ -57,7 +57,7 @@ staticResources: type: STATIC - connectTimeout: 10s loadAssignment: - clusterName: $(ENVOY_PROXY_INFRA_NAME) + clusterName: local_cluster endpoints: - lbEndpoints: - endpoint: @@ -69,7 +69,7 @@ staticResources: loadBalancingWeight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: local_cluster type: STATIC - connectTimeout: 10s loadAssignment: diff --git a/internal/xds/bootstrap/testdata/render/custom-server-port.yaml b/internal/xds/bootstrap/testdata/render/custom-server-port.yaml index 2db50957fd..94586a1f0a 100644 --- a/internal/xds/bootstrap/testdata/render/custom-server-port.yaml +++ b/internal/xds/bootstrap/testdata/render/custom-server-port.yaml @@ -9,7 +9,7 @@ admin: address: 127.0.0.1 port_value: 2222 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: local_cluster node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -86,7 +86,7 @@ static_resources: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: local_cluster endpoints: - lb_endpoints: - endpoint: @@ -98,7 +98,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: local_cluster type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/testdata/render/custom-stats-matcher.yaml b/internal/xds/bootstrap/testdata/render/custom-stats-matcher.yaml index 713a7fe607..a0cef5eb66 100644 --- a/internal/xds/bootstrap/testdata/render/custom-stats-matcher.yaml +++ b/internal/xds/bootstrap/testdata/render/custom-stats-matcher.yaml @@ -9,7 +9,7 @@ admin: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: local_cluster node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -97,7 +97,7 @@ static_resources: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: local_cluster endpoints: - lb_endpoints: - endpoint: @@ -109,7 +109,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: local_cluster type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/testdata/render/disable-prometheus.yaml b/internal/xds/bootstrap/testdata/render/disable-prometheus.yaml index 4a208968e3..00f493acc1 100644 --- a/internal/xds/bootstrap/testdata/render/disable-prometheus.yaml +++ b/internal/xds/bootstrap/testdata/render/disable-prometheus.yaml @@ -9,7 +9,7 @@ admin: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: local_cluster node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -39,7 +39,7 @@ static_resources: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: local_cluster endpoints: - lb_endpoints: - endpoint: @@ -51,7 +51,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: local_cluster type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/testdata/render/enable-prometheus-brotli-compression.yaml b/internal/xds/bootstrap/testdata/render/enable-prometheus-brotli-compression.yaml index c2dcfec86e..936b6b5204 100644 --- a/internal/xds/bootstrap/testdata/render/enable-prometheus-brotli-compression.yaml +++ b/internal/xds/bootstrap/testdata/render/enable-prometheus-brotli-compression.yaml @@ -9,7 +9,7 @@ admin: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: local_cluster node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -102,7 +102,7 @@ static_resources: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: local_cluster endpoints: - lb_endpoints: - endpoint: @@ -114,7 +114,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: local_cluster type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/testdata/render/enable-prometheus-gzip-compression.yaml b/internal/xds/bootstrap/testdata/render/enable-prometheus-gzip-compression.yaml index b403d141c8..b4e898497e 100644 --- a/internal/xds/bootstrap/testdata/render/enable-prometheus-gzip-compression.yaml +++ b/internal/xds/bootstrap/testdata/render/enable-prometheus-gzip-compression.yaml @@ -9,7 +9,7 @@ admin: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: local_cluster node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -102,7 +102,7 @@ static_resources: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: local_cluster endpoints: - lb_endpoints: - endpoint: @@ -114,7 +114,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: local_cluster type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/testdata/render/enable-prometheus.yaml b/internal/xds/bootstrap/testdata/render/enable-prometheus.yaml index cb72585b1f..a974728e63 100644 --- a/internal/xds/bootstrap/testdata/render/enable-prometheus.yaml +++ b/internal/xds/bootstrap/testdata/render/enable-prometheus.yaml @@ -9,7 +9,7 @@ admin: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: local_cluster node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -86,7 +86,7 @@ static_resources: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: local_cluster endpoints: - lb_endpoints: - endpoint: @@ -98,7 +98,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: local_cluster type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/testdata/render/ipv6.yaml b/internal/xds/bootstrap/testdata/render/ipv6.yaml index 5034bac754..ce56cc6abd 100644 --- a/internal/xds/bootstrap/testdata/render/ipv6.yaml +++ b/internal/xds/bootstrap/testdata/render/ipv6.yaml @@ -9,7 +9,7 @@ admin: address: ::1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: local_cluster node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -87,7 +87,7 @@ static_resources: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: local_cluster endpoints: - lb_endpoints: - endpoint: @@ -99,7 +99,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: local_cluster type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/testdata/render/otel-metrics-backendref.yaml b/internal/xds/bootstrap/testdata/render/otel-metrics-backendref.yaml index fceec2964a..b3b2f9b534 100644 --- a/internal/xds/bootstrap/testdata/render/otel-metrics-backendref.yaml +++ b/internal/xds/bootstrap/testdata/render/otel-metrics-backendref.yaml @@ -9,7 +9,7 @@ admin: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: local_cluster node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -64,7 +64,7 @@ static_resources: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: local_cluster endpoints: - lb_endpoints: - endpoint: @@ -76,7 +76,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: local_cluster type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/testdata/render/otel-metrics.yaml b/internal/xds/bootstrap/testdata/render/otel-metrics.yaml index fceec2964a..b3b2f9b534 100644 --- a/internal/xds/bootstrap/testdata/render/otel-metrics.yaml +++ b/internal/xds/bootstrap/testdata/render/otel-metrics.yaml @@ -9,7 +9,7 @@ admin: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: local_cluster node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -64,7 +64,7 @@ static_resources: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: local_cluster endpoints: - lb_endpoints: - endpoint: @@ -76,7 +76,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: local_cluster type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/testdata/render/with-max-heap-size-bytes.yaml b/internal/xds/bootstrap/testdata/render/with-max-heap-size-bytes.yaml index eb50d2ed30..33b2a460c2 100644 --- a/internal/xds/bootstrap/testdata/render/with-max-heap-size-bytes.yaml +++ b/internal/xds/bootstrap/testdata/render/with-max-heap-size-bytes.yaml @@ -9,7 +9,7 @@ admin: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: $(ENVOY_PROXY_INFRA_NAME) + local_cluster_name: local_cluster node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -86,7 +86,7 @@ static_resources: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: $(ENVOY_PROXY_INFRA_NAME) + cluster_name: local_cluster endpoints: - lb_endpoints: - endpoint: @@ -98,7 +98,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: $(ENVOY_PROXY_INFRA_NAME) + name: local_cluster type: STATIC - connect_timeout: 10s load_assignment: From 40086784eb43f02f2fc039058a0295fa622eb016 Mon Sep 17 00:00:00 2001 From: jukie <10012479+Jukie@users.noreply.github.com> Date: Thu, 24 Jul 2025 09:32:54 -0600 Subject: [PATCH 3/6] Adjust field name Signed-off-by: jukie <10012479+Jukie@users.noreply.github.com> --- internal/infrastructure/host/proxy_infra.go | 11 ++++++----- internal/infrastructure/kubernetes/proxy/resource.go | 2 +- internal/xds/bootstrap/bootstrap.go | 12 ++++++------ internal/xds/bootstrap/bootstrap.yaml.tpl | 6 +++--- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/internal/infrastructure/host/proxy_infra.go b/internal/infrastructure/host/proxy_infra.go index 6b19181b29..4fa0b8a388 100644 --- a/internal/infrastructure/host/proxy_infra.go +++ b/internal/infrastructure/host/proxy_infra.go @@ -8,7 +8,8 @@ package host import ( "context" "errors" - "github.com/envoyproxy/gateway/internal/infrastructure/kubernetes/proxy" + "fmt" + "github.com/envoyproxy/gateway/internal/envoygateway/config" "io" "os" "path/filepath" @@ -70,10 +71,10 @@ func (i *Infra) CreateOrUpdateProxyInfra(ctx context.Context, infra *ir.Infra) e Certificate: filepath.Join(i.sdsConfigPath, common.SdsCertFilename), TrustedCA: filepath.Join(i.sdsConfigPath, common.SdsCAFilename), }, - XdsServerHost: ptr.To("0.0.0.0"), - AdminServerPort: ptr.To(int32(0)), - StatsServerPort: ptr.To(int32(0)), - ProxyInfraName: ptr.To(proxy.ExpectedResourceHashedName(proxyInfra.Name)), + XdsServerHost: ptr.To("0.0.0.0"), + AdminServerPort: ptr.To(int32(0)), + StatsServerPort: ptr.To(int32(0)), + LocalClusterName: ptr.To(fmt.Sprintf("%s-%s", config.EnvoyPrefix, proxyName)), } args, err := common.BuildProxyArgs(proxyInfra, proxyConfig.Spec.Shutdown, bootstrapConfigOptions, proxyName, false) diff --git a/internal/infrastructure/kubernetes/proxy/resource.go b/internal/infrastructure/kubernetes/proxy/resource.go index 10b5feaad5..b84229fe15 100644 --- a/internal/infrastructure/kubernetes/proxy/resource.go +++ b/internal/infrastructure/kubernetes/proxy/resource.go @@ -109,7 +109,7 @@ func expectedProxyContainers(infra *ir.ProxyInfra, }, MaxHeapSizeBytes: maxHeapSizeBytes, XdsServerHost: ptr.To(fmt.Sprintf("%s.%s.svc.%s", config.EnvoyGatewayServiceName, controllerNamespace, dnsDomain)), - ProxyInfraName: ptr.To(ExpectedResourceHashedName(infra.Name)), + LocalClusterName: ptr.To(fmt.Sprintf("%s-%s", config.EnvoyPrefix, utils.GetHashedName(infra.Name, 64))), } args, err := common.BuildProxyArgs(infra, shutdownConfig, bootstrapConfigOptions, fmt.Sprintf("$(%s)", envoyPodEnvVar), gatewayNamespaceMode) diff --git a/internal/xds/bootstrap/bootstrap.go b/internal/xds/bootstrap/bootstrap.go index a6fff52475..f8bb5f3954 100644 --- a/internal/xds/bootstrap/bootstrap.go +++ b/internal/xds/bootstrap/bootstrap.go @@ -97,8 +97,8 @@ type bootstrapParameters struct { IPFamily string // GatewayNamespaceMode defines whether to use the Envoy Gateway namespace mode. GatewayNamespaceMode bool - // ProxyInfraName is the name of the ProxyInfra and used as the internal local_cluster name. - ProxyInfraName string + // LocalClusterName is the generated name of the Envoy ProxyInfra. + LocalClusterName string } type serverParameters struct { @@ -139,7 +139,7 @@ type RenderBootstrapConfigOptions struct { IPFamily *egv1a1.IPFamily ProxyMetrics *egv1a1.ProxyMetrics SdsConfig SdsConfigPath - ProxyInfraName *string + LocalClusterName *string XdsServerHost *string XdsServerPort *int32 AdminServerPort *int32 @@ -259,7 +259,7 @@ func GetRenderedBootstrapConfig(opts *RenderBootstrapConfigOptions) (string, err EnablePrometheusCompression: enablePrometheusCompression, PrometheusCompressionLibrary: prometheusCompressionLibrary, OtelMetricSinks: metricSinks, - ProxyInfraName: defaultLocalClusterName, + LocalClusterName: defaultLocalClusterName, }, } @@ -304,8 +304,8 @@ func GetRenderedBootstrapConfig(opts *RenderBootstrapConfigOptions) (string, err } cfg.parameters.GatewayNamespaceMode = opts.GatewayNamespaceMode cfg.parameters.OverloadManager.MaxHeapSizeBytes = opts.MaxHeapSizeBytes - if opts.ProxyInfraName != nil { - cfg.parameters.ProxyInfraName = *opts.ProxyInfraName + if opts.LocalClusterName != nil { + cfg.parameters.LocalClusterName = *opts.LocalClusterName } } diff --git a/internal/xds/bootstrap/bootstrap.yaml.tpl b/internal/xds/bootstrap/bootstrap.yaml.tpl index 034b3dcc64..d545aa95ed 100644 --- a/internal/xds/bootstrap/bootstrap.yaml.tpl +++ b/internal/xds/bootstrap/bootstrap.yaml.tpl @@ -9,7 +9,7 @@ admin: address: {{ .AdminServer.Address }} port_value: {{ .AdminServer.Port }} cluster_manager: - local_cluster_name: {{ .ProxyInfraName }} + local_cluster_name: {{ .LocalClusterName }} node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -174,7 +174,7 @@ static_resources: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: {{ .ProxyInfraName }} + cluster_name: {{ .LocalClusterName }} endpoints: - lb_endpoints: - endpoint: @@ -187,7 +187,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: {{ .ProxyInfraName }} + name: {{ .LocalClusterName }} type: STATIC - connect_timeout: 10s load_assignment: From 47b80d39e7f7c4c66bfc4e03cdce2e6533a6fc7f Mon Sep 17 00:00:00 2001 From: jukie <10012479+Jukie@users.noreply.github.com> Date: Thu, 24 Jul 2025 09:35:42 -0600 Subject: [PATCH 4/6] lint Signed-off-by: jukie <10012479+Jukie@users.noreply.github.com> --- internal/infrastructure/host/proxy_infra.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/infrastructure/host/proxy_infra.go b/internal/infrastructure/host/proxy_infra.go index 4fa0b8a388..21093ca696 100644 --- a/internal/infrastructure/host/proxy_infra.go +++ b/internal/infrastructure/host/proxy_infra.go @@ -9,7 +9,6 @@ import ( "context" "errors" "fmt" - "github.com/envoyproxy/gateway/internal/envoygateway/config" "io" "os" "path/filepath" @@ -19,6 +18,7 @@ import ( "k8s.io/utils/ptr" egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" + "github.com/envoyproxy/gateway/internal/envoygateway/config" "github.com/envoyproxy/gateway/internal/infrastructure/common" "github.com/envoyproxy/gateway/internal/ir" "github.com/envoyproxy/gateway/internal/utils" From 4a2f6fa2d194a6c470c8a8c2af1472d32b58e190 Mon Sep 17 00:00:00 2001 From: jukie <10012479+Jukie@users.noreply.github.com> Date: Thu, 24 Jul 2025 11:44:45 -0600 Subject: [PATCH 5/6] Use ServiceClusterName Signed-off-by: jukie <10012479+Jukie@users.noreply.github.com> --- internal/infrastructure/common/proxy_args.go | 14 +++++++++----- internal/infrastructure/host/proxy_infra.go | 9 +++------ .../infrastructure/kubernetes/proxy/resource.go | 1 - .../proxy/testdata/daemonsets/custom.yaml | 6 +++--- .../proxy/testdata/daemonsets/default-env.yaml | 6 +++--- .../proxy/testdata/daemonsets/default.yaml | 6 +++--- .../testdata/daemonsets/disable-prometheus.yaml | 6 +++--- .../proxy/testdata/daemonsets/extension-env.yaml | 6 +++--- .../daemonsets/gateway-namespace-mode.yaml | 6 +++--- .../override-labels-and-annotations.yaml | 6 +++--- .../override-prometheus-annotations.yaml | 6 +++--- .../proxy/testdata/daemonsets/patch-daemonset.yaml | 6 +++--- .../testdata/daemonsets/shutdown-manager.yaml | 6 +++--- .../proxy/testdata/daemonsets/volumes.yaml | 6 +++--- .../testdata/daemonsets/with-annotations.yaml | 6 +++--- .../proxy/testdata/daemonsets/with-extra-args.yaml | 6 +++--- .../daemonsets/with-image-pull-secrets.yaml | 6 +++--- .../proxy/testdata/daemonsets/with-name.yaml | 6 +++--- .../testdata/daemonsets/with-node-selector.yaml | 6 +++--- .../with-topology-spread-constraints.yaml | 6 +++--- .../proxy/testdata/deployments/custom-sa.yaml | 6 +++--- .../proxy/testdata/deployments/custom.yaml | 6 +++--- .../deployments/custom_with_initcontainers.yaml | 6 +++--- .../proxy/testdata/deployments/default-env.yaml | 6 +++--- .../proxy/testdata/deployments/default.yaml | 6 +++--- .../testdata/deployments/disable-prometheus.yaml | 6 +++--- .../proxy/testdata/deployments/dual-stack.yaml | 6 +++--- .../proxy/testdata/deployments/extension-env.yaml | 6 +++--- .../deployments/gateway-namespace-mode.yaml | 6 +++--- .../proxy/testdata/deployments/ipv6.yaml | 6 +++--- .../override-labels-and-annotations.yaml | 6 +++--- .../override-prometheus-annotations.yaml | 6 +++--- .../testdata/deployments/patch-deployment.yaml | 6 +++--- .../testdata/deployments/shutdown-manager.yaml | 6 +++--- .../proxy/testdata/deployments/volumes.yaml | 6 +++--- .../testdata/deployments/with-annotations.yaml | 6 +++--- .../deployments/with-empty-memory-limits.yaml | 6 +++--- .../testdata/deployments/with-extra-args.yaml | 6 +++--- .../deployments/with-image-pull-secrets.yaml | 6 +++--- .../proxy/testdata/deployments/with-name.yaml | 6 +++--- .../testdata/deployments/with-node-selector.yaml | 6 +++--- .../with-topology-spread-constraints.yaml | 6 +++--- .../gateway-namespace-mode/deployment.yaml | 12 ++++++------ internal/xds/bootstrap/bootstrap.go | 14 +++++++------- internal/xds/bootstrap/bootstrap.yaml.tpl | 6 +++--- 45 files changed, 145 insertions(+), 145 deletions(-) diff --git a/internal/infrastructure/common/proxy_args.go b/internal/infrastructure/common/proxy_args.go index 98a7e22cda..6d8563efad 100644 --- a/internal/infrastructure/common/proxy_args.go +++ b/internal/infrastructure/common/proxy_args.go @@ -8,6 +8,8 @@ package common import ( "fmt" + "k8s.io/utils/ptr" + egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" "github.com/envoyproxy/gateway/internal/ir" "github.com/envoyproxy/gateway/internal/xds/bootstrap" @@ -29,6 +31,13 @@ func BuildProxyArgs( serviceNode string, gatewayNamespaceMode bool, ) ([]string, error) { + serviceCluster := infra.Name + if gatewayNamespaceMode { + serviceCluster = fmt.Sprintf("%s/%s", infra.Namespace, infra.Name) + } + + bootstrapConfigOptions.ServiceClusterName = ptr.To(serviceCluster) + // If IPFamily is not set, try to determine it from the infrastructure. if bootstrapConfigOptions != nil && bootstrapConfigOptions.IPFamily == nil { bootstrapConfigOptions.IPFamily = getIPFamily(infra) @@ -51,11 +60,6 @@ func BuildProxyArgs( logging := infra.Config.Spec.Logging - serviceCluster := infra.Name - if gatewayNamespaceMode { - serviceCluster = fmt.Sprintf("%s/%s", infra.Namespace, infra.Name) - } - args := []string{ fmt.Sprintf("--service-cluster %s", serviceCluster), fmt.Sprintf("--service-node %s", serviceNode), diff --git a/internal/infrastructure/host/proxy_infra.go b/internal/infrastructure/host/proxy_infra.go index 21093ca696..229fdcd1c3 100644 --- a/internal/infrastructure/host/proxy_infra.go +++ b/internal/infrastructure/host/proxy_infra.go @@ -8,7 +8,6 @@ package host import ( "context" "errors" - "fmt" "io" "os" "path/filepath" @@ -18,7 +17,6 @@ import ( "k8s.io/utils/ptr" egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" - "github.com/envoyproxy/gateway/internal/envoygateway/config" "github.com/envoyproxy/gateway/internal/infrastructure/common" "github.com/envoyproxy/gateway/internal/ir" "github.com/envoyproxy/gateway/internal/utils" @@ -71,10 +69,9 @@ func (i *Infra) CreateOrUpdateProxyInfra(ctx context.Context, infra *ir.Infra) e Certificate: filepath.Join(i.sdsConfigPath, common.SdsCertFilename), TrustedCA: filepath.Join(i.sdsConfigPath, common.SdsCAFilename), }, - XdsServerHost: ptr.To("0.0.0.0"), - AdminServerPort: ptr.To(int32(0)), - StatsServerPort: ptr.To(int32(0)), - LocalClusterName: ptr.To(fmt.Sprintf("%s-%s", config.EnvoyPrefix, proxyName)), + XdsServerHost: ptr.To("0.0.0.0"), + AdminServerPort: ptr.To(int32(0)), + StatsServerPort: ptr.To(int32(0)), } args, err := common.BuildProxyArgs(proxyInfra, proxyConfig.Spec.Shutdown, bootstrapConfigOptions, proxyName, false) diff --git a/internal/infrastructure/kubernetes/proxy/resource.go b/internal/infrastructure/kubernetes/proxy/resource.go index b84229fe15..19e906404c 100644 --- a/internal/infrastructure/kubernetes/proxy/resource.go +++ b/internal/infrastructure/kubernetes/proxy/resource.go @@ -109,7 +109,6 @@ func expectedProxyContainers(infra *ir.ProxyInfra, }, MaxHeapSizeBytes: maxHeapSizeBytes, XdsServerHost: ptr.To(fmt.Sprintf("%s.%s.svc.%s", config.EnvoyGatewayServiceName, controllerNamespace, dnsDomain)), - LocalClusterName: ptr.To(fmt.Sprintf("%s-%s", config.EnvoyPrefix, utils.GetHashedName(infra.Name, 64))), } args, err := common.BuildProxyArgs(infra, shutdownConfig, bootstrapConfigOptions, fmt.Sprintf("$(%s)", envoyPodEnvVar), gatewayNamespaceMode) diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml index 23db3376b4..38069b3a16 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml @@ -55,7 +55,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -132,7 +132,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -144,7 +144,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml index a79f3610fa..824d6455bb 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml index 082ded95e2..e6b44f493b 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml index 6bbb3b6d13..e9914ef7ba 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml @@ -50,7 +50,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -80,7 +80,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -92,7 +92,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml index 8cd6c07dc4..3ed17a5311 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/gateway-namespace-mode.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/gateway-namespace-mode.yaml index 51030311a9..fa95a6fddb 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/gateway-namespace-mode.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/gateway-namespace-mode.yaml @@ -57,7 +57,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-gateway-1-e11eea07 + local_cluster_name: ns1/gateway-1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -134,7 +134,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-gateway-1-e11eea07 + cluster_name: ns1/gateway-1 endpoints: - lb_endpoints: - endpoint: @@ -146,7 +146,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-gateway-1-e11eea07 + name: ns1/gateway-1 type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml index 0f881a4ea8..8a46a3b382 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml @@ -63,7 +63,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -140,7 +140,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -152,7 +152,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-prometheus-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-prometheus-annotations.yaml index b1301f84d7..18bc97136c 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-prometheus-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-prometheus-annotations.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml index 302614fce8..0fc0169a6f 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml index 47184a2621..beffc4fffe 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml index 8def0b3adc..541cd4265f 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml index 2202323ab2..d8b4bd69fb 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml @@ -59,7 +59,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -136,7 +136,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -148,7 +148,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml index 30e8db56ba..a71fc9ac94 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml index 96b1e5969e..43698c5b87 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml index bb4e942c58..74fb54fbd5 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml index 42e91f57d6..b31b87c643 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml index 5dda8dbd5c..95829c8cfd 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -131,7 +131,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom-sa.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom-sa.yaml index 1d0edd0b0c..73fe9bc0e7 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom-sa.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom-sa.yaml @@ -61,7 +61,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-gateway-1-e11eea07 + local_cluster_name: ns1/gateway-1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -138,7 +138,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-gateway-1-e11eea07 + cluster_name: ns1/gateway-1 endpoints: - lb_endpoints: - endpoint: @@ -150,7 +150,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-gateway-1-e11eea07 + name: ns1/gateway-1 type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml index 65da563ce7..92cbec600c 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml @@ -60,7 +60,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -137,7 +137,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -149,7 +149,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml index 165f6f9538..290fe39a67 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml @@ -60,7 +60,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -137,7 +137,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -149,7 +149,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml index c4186bf8fc..f9f0a8e4ae 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml @@ -59,7 +59,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -136,7 +136,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -148,7 +148,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml index 2793bc5297..afa3567b83 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml index ed289bd60c..ce80f1c4d5 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml @@ -54,7 +54,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -84,7 +84,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -96,7 +96,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml index c1d69ba34a..6f9dfc10e0 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -136,7 +136,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -148,7 +148,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml index 642bbf9c2b..b585326db8 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml @@ -59,7 +59,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -136,7 +136,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -148,7 +148,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/gateway-namespace-mode.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/gateway-namespace-mode.yaml index aa34464165..55f0d76324 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/gateway-namespace-mode.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/gateway-namespace-mode.yaml @@ -61,7 +61,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-gateway-1-e11eea07 + local_cluster_name: ns1/gateway-1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -138,7 +138,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-gateway-1-e11eea07 + cluster_name: ns1/gateway-1 endpoints: - lb_endpoints: - endpoint: @@ -150,7 +150,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-gateway-1-e11eea07 + name: ns1/gateway-1 type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml index 391ab05f6c..8fba38d018 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml @@ -58,7 +58,7 @@ spec: address: ::1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -136,7 +136,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -148,7 +148,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml index eac68f5eeb..be1e0ef7f9 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml @@ -67,7 +67,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -144,7 +144,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -156,7 +156,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-prometheus-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-prometheus-annotations.yaml index 8ead8ba255..9a2d40e722 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-prometheus-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-prometheus-annotations.yaml @@ -60,7 +60,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -137,7 +137,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -149,7 +149,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml index f59ffc9743..2cd9e4f5c2 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml index baede75046..cc076bf90a 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml index 21a146fc78..e5df152dc7 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml @@ -59,7 +59,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -136,7 +136,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -148,7 +148,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml index 8fd790ac0c..dc88582604 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml @@ -63,7 +63,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -140,7 +140,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -152,7 +152,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml index 1d7272d654..0bafd9e0cc 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml index fd08338646..c7e27fe28c 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml index 536161b04a..d4b709f1a5 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml index 834d414044..0f8f820b45 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml index 0a1df668f2..b89bd6afd1 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml index 3becc22385..9f37bec51b 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml @@ -58,7 +58,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-default-37a8eec1 + local_cluster_name: default node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -135,7 +135,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-default-37a8eec1 + cluster_name: default endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-default-37a8eec1 + name: default type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/gateway-namespace-mode/deployment.yaml b/internal/infrastructure/kubernetes/proxy/testdata/gateway-namespace-mode/deployment.yaml index 5111374986..9a1afcfeb0 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/gateway-namespace-mode/deployment.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/gateway-namespace-mode/deployment.yaml @@ -61,7 +61,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-gateway-1-e11eea07 + local_cluster_name: namespace-1/gateway-1 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -138,7 +138,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-gateway-1-e11eea07 + cluster_name: namespace-1/gateway-1 endpoints: - lb_endpoints: - endpoint: @@ -150,7 +150,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-gateway-1-e11eea07 + name: namespace-1/gateway-1 type: STATIC - connect_timeout: 10s load_assignment: @@ -475,7 +475,7 @@ spec: address: 127.0.0.1 port_value: 19000 cluster_manager: - local_cluster_name: envoy-gateway-2-159f3c5f + local_cluster_name: namespace-2/gateway-2 node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -552,7 +552,7 @@ spec: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: envoy-gateway-2-159f3c5f + cluster_name: namespace-2/gateway-2 endpoints: - lb_endpoints: - endpoint: @@ -564,7 +564,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: envoy-gateway-2-159f3c5f + name: namespace-2/gateway-2 type: STATIC - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/bootstrap.go b/internal/xds/bootstrap/bootstrap.go index f8bb5f3954..3986dcf341 100644 --- a/internal/xds/bootstrap/bootstrap.go +++ b/internal/xds/bootstrap/bootstrap.go @@ -46,7 +46,7 @@ const ( defaultSdsTrustedCAPath = "/sds/xds-trusted-ca.json" defaultSdsCertificatePath = "/sds/xds-certificate.json" - defaultLocalClusterName = "local_cluster" + defaultServiceClusterName = "local_cluster" ) //go:embed bootstrap.yaml.tpl @@ -97,8 +97,8 @@ type bootstrapParameters struct { IPFamily string // GatewayNamespaceMode defines whether to use the Envoy Gateway namespace mode. GatewayNamespaceMode bool - // LocalClusterName is the generated name of the Envoy ProxyInfra. - LocalClusterName string + // ServiceClusterName is the generated name of the Envoy ServiceCluster. + ServiceClusterName string } type serverParameters struct { @@ -139,7 +139,7 @@ type RenderBootstrapConfigOptions struct { IPFamily *egv1a1.IPFamily ProxyMetrics *egv1a1.ProxyMetrics SdsConfig SdsConfigPath - LocalClusterName *string + ServiceClusterName *string XdsServerHost *string XdsServerPort *int32 AdminServerPort *int32 @@ -259,7 +259,7 @@ func GetRenderedBootstrapConfig(opts *RenderBootstrapConfigOptions) (string, err EnablePrometheusCompression: enablePrometheusCompression, PrometheusCompressionLibrary: prometheusCompressionLibrary, OtelMetricSinks: metricSinks, - LocalClusterName: defaultLocalClusterName, + ServiceClusterName: defaultServiceClusterName, }, } @@ -304,8 +304,8 @@ func GetRenderedBootstrapConfig(opts *RenderBootstrapConfigOptions) (string, err } cfg.parameters.GatewayNamespaceMode = opts.GatewayNamespaceMode cfg.parameters.OverloadManager.MaxHeapSizeBytes = opts.MaxHeapSizeBytes - if opts.LocalClusterName != nil { - cfg.parameters.LocalClusterName = *opts.LocalClusterName + if opts.ServiceClusterName != nil { + cfg.parameters.ServiceClusterName = *opts.ServiceClusterName } } diff --git a/internal/xds/bootstrap/bootstrap.yaml.tpl b/internal/xds/bootstrap/bootstrap.yaml.tpl index d545aa95ed..d8a3794aff 100644 --- a/internal/xds/bootstrap/bootstrap.yaml.tpl +++ b/internal/xds/bootstrap/bootstrap.yaml.tpl @@ -9,7 +9,7 @@ admin: address: {{ .AdminServer.Address }} port_value: {{ .AdminServer.Port }} cluster_manager: - local_cluster_name: {{ .LocalClusterName }} + local_cluster_name: {{ .ServiceClusterName }} node: locality: zone: $(ENVOY_SERVICE_ZONE) @@ -174,7 +174,7 @@ static_resources: - connect_timeout: 10s lb_policy: ROUND_ROBIN load_assignment: - cluster_name: {{ .LocalClusterName }} + cluster_name: {{ .ServiceClusterName }} endpoints: - lb_endpoints: - endpoint: @@ -187,7 +187,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: {{ .LocalClusterName }} + name: {{ .ServiceClusterName }} type: STATIC - connect_timeout: 10s load_assignment: From 1fe86795a84dca5d8832f2872f0d6f11110db458 Mon Sep 17 00:00:00 2001 From: jukie <10012479+Jukie@users.noreply.github.com> Date: Thu, 24 Jul 2025 11:55:47 -0600 Subject: [PATCH 6/6] lint Signed-off-by: jukie <10012479+Jukie@users.noreply.github.com> --- internal/infrastructure/common/proxy_args.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/internal/infrastructure/common/proxy_args.go b/internal/infrastructure/common/proxy_args.go index 6d8563efad..4d6a67892d 100644 --- a/internal/infrastructure/common/proxy_args.go +++ b/internal/infrastructure/common/proxy_args.go @@ -36,11 +36,14 @@ func BuildProxyArgs( serviceCluster = fmt.Sprintf("%s/%s", infra.Namespace, infra.Name) } - bootstrapConfigOptions.ServiceClusterName = ptr.To(serviceCluster) + if bootstrapConfigOptions != nil { + // Configure local Envoy ServiceCluster + bootstrapConfigOptions.ServiceClusterName = ptr.To(serviceCluster) - // If IPFamily is not set, try to determine it from the infrastructure. - if bootstrapConfigOptions != nil && bootstrapConfigOptions.IPFamily == nil { - bootstrapConfigOptions.IPFamily = getIPFamily(infra) + // If IPFamily is not set, try to determine it from the infrastructure. + if bootstrapConfigOptions.IPFamily == nil { + bootstrapConfigOptions.IPFamily = getIPFamily(infra) + } } bootstrapConfigOptions.GatewayNamespaceMode = gatewayNamespaceMode