diff --git a/internal/infrastructure/common/proxy_args.go b/internal/infrastructure/common/proxy_args.go index 98a7e22cda..4d6a67892d 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,9 +31,19 @@ func BuildProxyArgs( serviceNode string, gatewayNamespaceMode bool, ) ([]string, error) { - // If IPFamily is not set, try to determine it from the infrastructure. - if bootstrapConfigOptions != nil && bootstrapConfigOptions.IPFamily == nil { - bootstrapConfigOptions.IPFamily = getIPFamily(infra) + serviceCluster := infra.Name + if gatewayNamespaceMode { + serviceCluster = fmt.Sprintf("%s/%s", infra.Namespace, infra.Name) + } + + 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.IPFamily == nil { + bootstrapConfigOptions.IPFamily = getIPFamily(infra) + } } bootstrapConfigOptions.GatewayNamespaceMode = gatewayNamespaceMode @@ -51,11 +63,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/kubernetes/proxy/testdata/daemonsets/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml index 5d74e81b95..5032c858ae 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -144,7 +144,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 31c8b27a6d..42c9abbef1 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 a04aec279b..75b37037c0 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 9cfdd71cb4..4c2ae4741d 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -92,7 +92,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 258a025501..e1448f65f3 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 ebcc1b260d..9876d80fd2 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: 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: local_cluster + cluster_name: ns1/gateway-1 endpoints: - lb_endpoints: - endpoint: @@ -146,7 +146,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 63e9dad95e..d51f06a91e 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -152,7 +152,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 0479f16f81..6daf406283 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 68e7da215a..af349ae315 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 9c5436b1c0..93fca25a49 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 fc05f9e29f..0fe48735c7 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 798cf1d050..e23b7e5f3d 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -148,7 +148,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 d475297548..85551faca5 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 ec113b1bc4..7c702c7e7b 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 11d5eb3798..ae57b4f37d 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 cac89239fb..1f946a609f 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 188b00c9d9..a600458f21 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -143,7 +143,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 a2794cc186..3a9dc52e25 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: 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: local_cluster + cluster_name: ns1/gateway-1 endpoints: - lb_endpoints: - endpoint: @@ -150,7 +150,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 004ea40cf3..a166ae60a8 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -149,7 +149,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 c07b52b208..8acc3756ea 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -149,7 +149,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 d85c8e4e3f..0d349bc171 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -148,7 +148,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 92372f5f16..ede9ec8af1 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 8dcf1a0f34..0f09569fe4 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -96,7 +96,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 c31810e5b9..9ee4006cda 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -148,7 +148,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 7a0a07363e..acf680897f 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -148,7 +148,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 1db514af8c..d6597ba7e4 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: 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: local_cluster + cluster_name: ns1/gateway-1 endpoints: - lb_endpoints: - endpoint: @@ -150,7 +150,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 fdcd253951..2c70895264 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -148,7 +148,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 d95171bdf8..f36c72213f 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -156,7 +156,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 1ee6a497a9..277d3d6b6e 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -149,7 +149,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 cdaa6d5ec5..c146c0762c 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 3427283284..fbdeedc0fc 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 6301748395..f108892f7e 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -148,7 +148,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 2bb36b2e77..d26f2927b6 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -152,7 +152,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 df691645cc..8b2d1062e4 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 4fd9b0bf9a..f33611c8c5 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 f9616507da..7803840828 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 ba964d2a2f..f28e21e5bf 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 905f3d706a..391c2789b5 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 a1fee33efa..fbfa53939f 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: default 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: default endpoints: - lb_endpoints: - endpoint: @@ -147,7 +147,7 @@ spec: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + 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 643cb90d41..0e3c18c3c1 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: 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: local_cluster + 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: local_cluster + 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: local_cluster + 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: local_cluster + 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: local_cluster + 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 27fc7b4a2c..3986dcf341 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" + + defaultServiceClusterName = "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 + // ServiceClusterName is the generated name of the Envoy ServiceCluster. + ServiceClusterName string } type serverParameters struct { @@ -135,6 +139,7 @@ type RenderBootstrapConfigOptions struct { IPFamily *egv1a1.IPFamily ProxyMetrics *egv1a1.ProxyMetrics SdsConfig SdsConfigPath + ServiceClusterName *string XdsServerHost *string XdsServerPort *int32 AdminServerPort *int32 @@ -254,6 +259,7 @@ func GetRenderedBootstrapConfig(opts *RenderBootstrapConfigOptions) (string, err EnablePrometheusCompression: enablePrometheusCompression, PrometheusCompressionLibrary: prometheusCompressionLibrary, OtelMetricSinks: metricSinks, + ServiceClusterName: defaultServiceClusterName, }, } @@ -298,6 +304,9 @@ func GetRenderedBootstrapConfig(opts *RenderBootstrapConfigOptions) (string, err } cfg.parameters.GatewayNamespaceMode = opts.GatewayNamespaceMode cfg.parameters.OverloadManager.MaxHeapSizeBytes = opts.MaxHeapSizeBytes + if opts.ServiceClusterName != nil { + cfg.parameters.ServiceClusterName = *opts.ServiceClusterName + } } if err := cfg.render(); err != nil { diff --git a/internal/xds/bootstrap/bootstrap.yaml.tpl b/internal/xds/bootstrap/bootstrap.yaml.tpl index c6956fe868..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: local_cluster + 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: local_cluster + cluster_name: {{ .ServiceClusterName }} endpoints: - lb_endpoints: - endpoint: @@ -187,7 +187,7 @@ static_resources: load_balancing_weight: 1 locality: zone: $(ENVOY_SERVICE_ZONE) - name: local_cluster + name: {{ .ServiceClusterName }} type: STATIC - connect_timeout: 10s load_assignment: