From c043613ebcdf8dc79799a1826667e8a941ec736e Mon Sep 17 00:00:00 2001 From: jukie <10012479+Jukie@users.noreply.github.com> Date: Tue, 20 May 2025 21:41:46 -0600 Subject: [PATCH 1/3] Quoted string for zone values Signed-off-by: jukie <10012479+Jukie@users.noreply.github.com> --- .../testdata/translate/out/default-resources.all.yaml | 4 ++-- .../kubernetes/proxy/testdata/daemonsets/custom.yaml | 4 ++-- .../kubernetes/proxy/testdata/daemonsets/default-env.yaml | 4 ++-- .../kubernetes/proxy/testdata/daemonsets/default.yaml | 4 ++-- .../proxy/testdata/daemonsets/disable-prometheus.yaml | 4 ++-- .../proxy/testdata/daemonsets/extension-env.yaml | 4 ++-- .../daemonsets/override-labels-and-annotations.yaml | 4 ++-- .../proxy/testdata/daemonsets/patch-daemonset.yaml | 4 ++-- .../proxy/testdata/daemonsets/shutdown-manager.yaml | 4 ++-- .../kubernetes/proxy/testdata/daemonsets/volumes.yaml | 4 ++-- .../proxy/testdata/daemonsets/with-annotations.yaml | 4 ++-- .../proxy/testdata/daemonsets/with-extra-args.yaml | 4 ++-- .../testdata/daemonsets/with-image-pull-secrets.yaml | 4 ++-- .../kubernetes/proxy/testdata/daemonsets/with-name.yaml | 4 ++-- .../proxy/testdata/daemonsets/with-node-selector.yaml | 4 ++-- .../daemonsets/with-topology-spread-constraints.yaml | 4 ++-- .../kubernetes/proxy/testdata/deployments/custom.yaml | 4 ++-- .../testdata/deployments/custom_with_initcontainers.yaml | 4 ++-- .../proxy/testdata/deployments/default-env.yaml | 4 ++-- .../kubernetes/proxy/testdata/deployments/default.yaml | 4 ++-- .../proxy/testdata/deployments/disable-prometheus.yaml | 4 ++-- .../kubernetes/proxy/testdata/deployments/dual-stack.yaml | 4 ++-- .../proxy/testdata/deployments/extension-env.yaml | 4 ++-- .../kubernetes/proxy/testdata/deployments/ipv6.yaml | 4 ++-- .../deployments/override-labels-and-annotations.yaml | 4 ++-- .../proxy/testdata/deployments/patch-deployment.yaml | 4 ++-- .../proxy/testdata/deployments/shutdown-manager.yaml | 4 ++-- .../kubernetes/proxy/testdata/deployments/volumes.yaml | 4 ++-- .../proxy/testdata/deployments/with-annotations.yaml | 4 ++-- .../testdata/deployments/with-empty-memory-limits.yaml | 4 ++-- .../proxy/testdata/deployments/with-extra-args.yaml | 4 ++-- .../testdata/deployments/with-image-pull-secrets.yaml | 4 ++-- .../kubernetes/proxy/testdata/deployments/with-name.yaml | 4 ++-- .../proxy/testdata/deployments/with-node-selector.yaml | 4 ++-- .../deployments/with-topology-spread-constraints.yaml | 4 ++-- .../proxy/testdata/gateway-namespace-mode/deployment.yaml | 8 ++++---- internal/provider/kubernetes/topology_injector.go | 2 +- internal/provider/kubernetes/topology_injector_test.go | 4 ++-- internal/xds/bootstrap/bootstrap.yaml.tpl | 4 ++-- .../xds/bootstrap/testdata/render/custom-server-port.yaml | 4 ++-- .../bootstrap/testdata/render/custom-stats-matcher.yaml | 4 ++-- .../xds/bootstrap/testdata/render/disable-prometheus.yaml | 4 ++-- .../render/enable-prometheus-brotli-compression.yaml | 4 ++-- .../render/enable-prometheus-gzip-compression.yaml | 4 ++-- .../xds/bootstrap/testdata/render/enable-prometheus.yaml | 4 ++-- internal/xds/bootstrap/testdata/render/ipv6.yaml | 4 ++-- .../testdata/render/otel-metrics-backendref.yaml | 4 ++-- internal/xds/bootstrap/testdata/render/otel-metrics.yaml | 4 ++-- .../testdata/render/with-max-heap-size-bytes.yaml | 4 ++-- tools/hack/create-cluster.sh | 4 ++-- 50 files changed, 101 insertions(+), 101 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 0d0906fa80..fddc62d5c6 100644 --- a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml @@ -23,7 +23,7 @@ envoyProxyForGatewayClass: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -108,7 +108,7 @@ envoyProxyForGatewayClass: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml index 10e0d530a3..96dbe024d1 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml @@ -52,7 +52,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -137,7 +137,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml index c128b84b22..2cc154b090 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml @@ -51,7 +51,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -136,7 +136,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml index d68424ee14..891221b5f2 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml @@ -51,7 +51,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -136,7 +136,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml index a1bea43d22..3bfd653482 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml @@ -47,7 +47,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -85,7 +85,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml index 4b82730649..dbfc180dc0 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml @@ -51,7 +51,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -136,7 +136,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s 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 cf8385e85c..1308dbb296 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 @@ -60,7 +60,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -145,7 +145,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml index 2f06bc272d..0e628485cd 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml @@ -51,7 +51,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -136,7 +136,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml index 57f48cddc8..9cbae2d773 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml @@ -51,7 +51,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -136,7 +136,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml index 00237afd96..e247bfc043 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml @@ -51,7 +51,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -136,7 +136,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml index 047e540959..3fbe7588c4 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml @@ -56,7 +56,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -141,7 +141,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s 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 0e7e21b346..41b48ed019 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml @@ -51,7 +51,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -136,7 +136,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s 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 0db3152211..b49d0d855f 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 @@ -51,7 +51,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -136,7 +136,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml index 139de240e0..9f8bea5301 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml @@ -51,7 +51,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -136,7 +136,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s 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 6009e8f096..159b4879ef 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml @@ -51,7 +51,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -136,7 +136,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s 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 2717131c64..0353559695 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 @@ -51,7 +51,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -136,7 +136,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml index 2e6f822133..d27485017f 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml @@ -57,7 +57,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -142,7 +142,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s 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 77014daeda..2152a68281 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml @@ -57,7 +57,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -142,7 +142,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml index 6a1da9c6cf..2be25b9926 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml @@ -56,7 +56,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -141,7 +141,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml index c4c5893421..a93634f37b 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml @@ -55,7 +55,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -140,7 +140,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml index 16375de023..16eb434dea 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml @@ -51,7 +51,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -89,7 +89,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml index 46087bead2..ad9c108729 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml @@ -55,7 +55,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -141,7 +141,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml index 1aff8bf165..913e0f5cb5 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml @@ -56,7 +56,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -141,7 +141,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml index a616da3768..6dd332beb2 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml @@ -55,7 +55,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -141,7 +141,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s 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 ff6b9b4d6f..85f44e8e05 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 @@ -64,7 +64,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -149,7 +149,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml index aba70d8b78..36fb15a9ee 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml @@ -55,7 +55,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -140,7 +140,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml index 20d7a92ec8..12d3c9db95 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml @@ -55,7 +55,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -140,7 +140,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml index 065c9b05d1..a4c257802f 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml @@ -56,7 +56,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -141,7 +141,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml index 1691d50116..4a6f6af5b8 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml @@ -60,7 +60,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -145,7 +145,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s 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 3251332011..7340fce7be 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 @@ -55,7 +55,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -140,7 +140,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s 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 c6590cf7a6..532991c889 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml @@ -55,7 +55,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -140,7 +140,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s 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 a0f698965e..e3910aa1ad 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 @@ -55,7 +55,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -140,7 +140,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml index a44e1f263a..1b37537ef3 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml @@ -55,7 +55,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -140,7 +140,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s 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 72cb76f9c1..9856b12cb6 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml @@ -55,7 +55,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -140,7 +140,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s 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 f236771abc..8dfac96862 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 @@ -55,7 +55,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -140,7 +140,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s 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 ba240a1208..9f602ee1c7 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/gateway-namespace-mode/deployment.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/gateway-namespace-mode/deployment.yaml @@ -55,7 +55,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -140,7 +140,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s @@ -499,7 +499,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -584,7 +584,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/provider/kubernetes/topology_injector.go b/internal/provider/kubernetes/topology_injector.go index b0569e5aa0..9a4edea229 100644 --- a/internal/provider/kubernetes/topology_injector.go +++ b/internal/provider/kubernetes/topology_injector.go @@ -80,7 +80,7 @@ func (m *ProxyTopologyInjector) Handle(ctx context.Context, req admission.Reques if binding.Annotations == nil { binding.Annotations = map[string]string{} } - binding.Annotations[corev1.LabelTopologyZone] = zone + binding.Annotations[corev1.LabelTopologyZone] = fmt.Sprintf("%q", zone) } else { logger.V(1).Info("Skipping injection due to missing topology label on node") return admission.Allowed("Skipping injection due to missing topology label on node") diff --git a/internal/provider/kubernetes/topology_injector_test.go b/internal/provider/kubernetes/topology_injector_test.go index 6128214a80..399229c4a2 100644 --- a/internal/provider/kubernetes/topology_injector_test.go +++ b/internal/provider/kubernetes/topology_injector_test.go @@ -41,7 +41,7 @@ func TestProxyTopologyInjector_Handle(t *testing.T) { defaultNode := &corev1.Node{ ObjectMeta: metav1.ObjectMeta{ Name: "node-A", - Labels: map[string]string{corev1.LabelTopologyZone: "zone1"}, + Labels: map[string]string{corev1.LabelTopologyZone: "0"}, }, } @@ -67,7 +67,7 @@ func TestProxyTopologyInjector_Handle(t *testing.T) { Operation: "add", Path: "/metadata/annotations", Value: map[string]interface{}{ - "topology.kubernetes.io/zone": "zone1", + "topology.kubernetes.io/zone": "\"0\"", }, }}, }, diff --git a/internal/xds/bootstrap/bootstrap.yaml.tpl b/internal/xds/bootstrap/bootstrap.yaml.tpl index c4bb5e4843..8cb1824b23 100644 --- a/internal/xds/bootstrap/bootstrap.yaml.tpl +++ b/internal/xds/bootstrap/bootstrap.yaml.tpl @@ -12,7 +12,7 @@ cluster_manager: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) {{- if .StatsMatcher }} stats_config: stats_matcher: @@ -186,7 +186,7 @@ static_resources: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/xds/bootstrap/testdata/render/custom-server-port.yaml b/internal/xds/bootstrap/testdata/render/custom-server-port.yaml index 79b64b4725..6ac82d857a 100644 --- a/internal/xds/bootstrap/testdata/render/custom-server-port.yaml +++ b/internal/xds/bootstrap/testdata/render/custom-server-port.yaml @@ -12,7 +12,7 @@ cluster_manager: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -97,7 +97,7 @@ static_resources: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/xds/bootstrap/testdata/render/custom-stats-matcher.yaml b/internal/xds/bootstrap/testdata/render/custom-stats-matcher.yaml index 93f4c1a8c4..42602485aa 100644 --- a/internal/xds/bootstrap/testdata/render/custom-stats-matcher.yaml +++ b/internal/xds/bootstrap/testdata/render/custom-stats-matcher.yaml @@ -12,7 +12,7 @@ cluster_manager: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) stats_config: stats_matcher: inclusion_list: @@ -108,7 +108,7 @@ static_resources: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/xds/bootstrap/testdata/render/disable-prometheus.yaml b/internal/xds/bootstrap/testdata/render/disable-prometheus.yaml index 937296ef3a..55a96506e6 100644 --- a/internal/xds/bootstrap/testdata/render/disable-prometheus.yaml +++ b/internal/xds/bootstrap/testdata/render/disable-prometheus.yaml @@ -12,7 +12,7 @@ cluster_manager: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -50,7 +50,7 @@ static_resources: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s 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 652d532c9f..80b5de346d 100644 --- a/internal/xds/bootstrap/testdata/render/enable-prometheus-brotli-compression.yaml +++ b/internal/xds/bootstrap/testdata/render/enable-prometheus-brotli-compression.yaml @@ -12,7 +12,7 @@ cluster_manager: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -113,7 +113,7 @@ static_resources: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s 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 66c8d04049..a63969b5a5 100644 --- a/internal/xds/bootstrap/testdata/render/enable-prometheus-gzip-compression.yaml +++ b/internal/xds/bootstrap/testdata/render/enable-prometheus-gzip-compression.yaml @@ -12,7 +12,7 @@ cluster_manager: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -113,7 +113,7 @@ static_resources: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/xds/bootstrap/testdata/render/enable-prometheus.yaml b/internal/xds/bootstrap/testdata/render/enable-prometheus.yaml index 05aae78543..947f274350 100644 --- a/internal/xds/bootstrap/testdata/render/enable-prometheus.yaml +++ b/internal/xds/bootstrap/testdata/render/enable-prometheus.yaml @@ -12,7 +12,7 @@ cluster_manager: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -97,7 +97,7 @@ static_resources: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/xds/bootstrap/testdata/render/ipv6.yaml b/internal/xds/bootstrap/testdata/render/ipv6.yaml index 90fa14380b..bafa099de8 100644 --- a/internal/xds/bootstrap/testdata/render/ipv6.yaml +++ b/internal/xds/bootstrap/testdata/render/ipv6.yaml @@ -12,7 +12,7 @@ cluster_manager: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -98,7 +98,7 @@ static_resources: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/xds/bootstrap/testdata/render/otel-metrics-backendref.yaml b/internal/xds/bootstrap/testdata/render/otel-metrics-backendref.yaml index de2379c1fd..d89c3a85bf 100644 --- a/internal/xds/bootstrap/testdata/render/otel-metrics-backendref.yaml +++ b/internal/xds/bootstrap/testdata/render/otel-metrics-backendref.yaml @@ -12,7 +12,7 @@ cluster_manager: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -75,7 +75,7 @@ static_resources: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/internal/xds/bootstrap/testdata/render/otel-metrics.yaml b/internal/xds/bootstrap/testdata/render/otel-metrics.yaml index de2379c1fd..d89c3a85bf 100644 --- a/internal/xds/bootstrap/testdata/render/otel-metrics.yaml +++ b/internal/xds/bootstrap/testdata/render/otel-metrics.yaml @@ -12,7 +12,7 @@ cluster_manager: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -75,7 +75,7 @@ static_resources: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s 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 de27984f32..9b9eb6d8b9 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 @@ -12,7 +12,7 @@ cluster_manager: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -97,7 +97,7 @@ static_resources: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s diff --git a/tools/hack/create-cluster.sh b/tools/hack/create-cluster.sh index 6c2a93f515..6b440b084c 100755 --- a/tools/hack/create-cluster.sh +++ b/tools/hack/create-cluster.sh @@ -30,14 +30,14 @@ networking: nodes: - role: control-plane labels: - "topology.kubernetes.io/zone": "0" + "topology.kubernetes.io/zone": 0 EOM ) # https://kind.sigs.k8s.io/docs/user/quick-start/#multi-node-clusters if [[ -n "${NUM_WORKERS}" ]]; then for i in $(seq 1 "${NUM_WORKERS}"); do - KIND_CFG+=$(printf "\n- role: worker\n labels:\n \"topology.kubernetes.io/zone\": \"%s\"" "$i") + KIND_CFG+=$(printf "\n- role: worker\n labels:\n \"topology.kubernetes.io/zone\": %s" "$i") done fi From afb15b2dab072ede1c6f25e1e3ef7c45aa523c1a Mon Sep 17 00:00:00 2001 From: jukie <10012479+Jukie@users.noreply.github.com> Date: Tue, 20 May 2025 22:01:32 -0600 Subject: [PATCH 2/3] release note Signed-off-by: jukie <10012479+Jukie@users.noreply.github.com> --- release-notes/current.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/release-notes/current.yaml b/release-notes/current.yaml index 1fe5d4424e..d3327e2455 100644 --- a/release-notes/current.yaml +++ b/release-notes/current.yaml @@ -14,6 +14,7 @@ new features: | Added support for local rate limit header. bug fixes: | + Handle integer zone annotation values # Enhancements that improve performance. performance improvements: | From 5ab54b132ad2508a58d7c0c14057026fd959c2c7 Mon Sep 17 00:00:00 2001 From: jukie <10012479+Jukie@users.noreply.github.com> Date: Mon, 26 May 2025 17:56:22 -0600 Subject: [PATCH 3/3] regen Signed-off-by: jukie <10012479+Jukie@users.noreply.github.com> --- .../proxy/testdata/daemonsets/gateway-namespace-mode.yaml | 4 ++-- .../proxy/testdata/deployments/gateway-namespace-mode.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 336705faa8..9cc6bf73e9 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/gateway-namespace-mode.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/gateway-namespace-mode.yaml @@ -56,7 +56,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -141,7 +141,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s 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 c32da9e94b..969057ace2 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/gateway-namespace-mode.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/gateway-namespace-mode.yaml @@ -60,7 +60,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -145,7 +145,7 @@ spec: load_balancing_weight: 1 load_balancing_weight: 1 locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) name: local_cluster type: STATIC - connect_timeout: 10s