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 d32896c2c4..cefeca7d51 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 490b8516fb..4603f72470 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 f2a9ac4af0..a1a4d9bf99 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 e76912906e..b4e83c6d41 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 9d28c2438c..aec6f53363 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 47d98de044..f6a59ef158 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/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/daemonsets/override-labels-and-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml index 335af41346..ddefe90b01 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 0a3df16c88..fdb1cd9263 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 3205887615..0cedfdb140 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 5d228dc1a7..42fb53cf62 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 6a0ccedd3c..7495912ede 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 82766a0cee..5908354597 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 ffaeaf5500..279b032854 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 3c54978e5c..5b461e56d8 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 a0f53dd758..0e87057373 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 1548efa17d..0fb3224390 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 1f09bd4502..b93281c308 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 b646e37401..99d3b24f2a 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 bee9650598..b338506c9f 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 538a837773..fa52c6862f 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 762d42e5f9..e32820f4c8 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 41f290234a..8b2443e75b 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 034697656a..631aba61f1 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/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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml index 37d053e036..ae2405c92a 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 460174656c..4200837e6e 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 1586d258ac..fe7d322b88 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 90cfd5c37b..c87d95c8b8 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 d2df4f7852..6eecc815be 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 ae5d29392d..f88b710cf4 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 0e4d831cdb..31f98d5e07 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 589bbb9112..5d8cb792a8 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 c723c4f0b1..9fd95327a3 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 212acfc745..a514ea8cf5 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 81479bbd4b..7748279a70 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 182b1407a7..fcda05eebc 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 0483bd7fd8..710787b20f 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/gateway-namespace-mode/deployment.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/gateway-namespace-mode/deployment.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 @@ -464,7 +464,7 @@ spec: local_cluster_name: local_cluster node: locality: - zone: "$(ENVOY_SERVICE_ZONE)" + zone: $(ENVOY_SERVICE_ZONE) layered_runtime: layers: - name: global_config @@ -549,7 +549,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 dafb277d96..c6956fe868 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 ab036892ea..94586a1f0a 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 525ad200a3..a0cef5eb66 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 0ae906b711..00f493acc1 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 0866561b9c..936b6b5204 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 00c0230d69..b4e898497e 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 b32ad36fe1..a974728e63 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 436710a883..ce56cc6abd 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 dcd84799bf..b3b2f9b534 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 dcd84799bf..b3b2f9b534 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 26e54e4e7a..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 @@ -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/release-notes/current.yaml b/release-notes/current.yaml index 2e74fd8d78..decd1f7251 100644 --- a/release-notes/current.yaml +++ b/release-notes/current.yaml @@ -18,6 +18,7 @@ new features: | Added support for configuring hostname in active HTTP healthchecks. bug fixes: | + Handle integer zone annotation values Fixed issue where WASM cache init failure caused routes with WASM-less EnvoyExtensionPolicies to have 500 direct responses. # Enhancements that improve performance. 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