diff --git a/internal/infrastructure/kubernetes/proxy/resource.go b/internal/infrastructure/kubernetes/proxy/resource.go index 7ecd3c4410..d001830f8c 100644 --- a/internal/infrastructure/kubernetes/proxy/resource.go +++ b/internal/infrastructure/kubernetes/proxy/resource.go @@ -26,8 +26,8 @@ import ( const ( // envoyContainerName is the name of the Envoy container. envoyContainerName = "envoy" - // envoyNsEnvVar is the name of the Envoy Gateway namespace environment variable. - envoyNsEnvVar = "ENVOY_GATEWAY_NAMESPACE" + // envoyNsEnvVar is the name of the Envoy pod namespace environment variable. + envoyNsEnvVar = "ENVOY_POD_NAMESPACE" // envoyPodEnvVar is the name of the Envoy pod name environment variable. envoyPodEnvVar = "ENVOY_POD_NAME" // envoyZoneEnvVar is the Envoy pod locality zone name @@ -132,7 +132,7 @@ func expectedProxyContainers(infra *ir.ProxyInfra, ImagePullPolicy: corev1.PullIfNotPresent, Command: []string{"envoy"}, Args: args, - Env: expectedContainerEnv(containerSpec, controllerNamespace), + Env: expectedContainerEnv(containerSpec), Resources: *containerSpec.Resources, SecurityContext: expectedEnvoySecurityContext(containerSpec), Ports: ports, @@ -194,7 +194,7 @@ func expectedProxyContainers(infra *ir.ProxyInfra, ImagePullPolicy: corev1.PullIfNotPresent, Command: []string{"envoy-gateway"}, Args: expectedShutdownManagerArgs(shutdownConfig), - Env: expectedContainerEnv(nil, controllerNamespace), + Env: expectedContainerEnv(nil), Resources: *egv1a1.DefaultShutdownManagerContainerResourceRequirements(), TerminationMessagePolicy: corev1.TerminationMessageReadFile, TerminationMessagePath: "/dev/termination-log", @@ -404,11 +404,25 @@ func sdsConfigMapItems(gatewayNamespaceMode bool) []corev1.KeyToPath { } // expectedContainerEnv returns expected proxy container envs. -func expectedContainerEnv(containerSpec *egv1a1.KubernetesContainerSpec, controllerNamespace string) []corev1.EnvVar { +func expectedContainerEnv(containerSpec *egv1a1.KubernetesContainerSpec) []corev1.EnvVar { env := []corev1.EnvVar{ { - Name: envoyNsEnvVar, - Value: controllerNamespace, + Name: envoyNsEnvVar, + ValueFrom: &corev1.EnvVarSource{ + FieldRef: &corev1.ObjectFieldSelector{ + APIVersion: "v1", + FieldPath: "metadata.namespace", + }, + }, + }, + { + Name: envoyPodEnvVar, + ValueFrom: &corev1.EnvVarSource{ + FieldRef: &corev1.ObjectFieldSelector{ + APIVersion: "v1", + FieldPath: "metadata.name", + }, + }, }, { Name: envoyZoneEnvVar, @@ -421,16 +435,6 @@ func expectedContainerEnv(containerSpec *egv1a1.KubernetesContainerSpec, control }, } - env = append(env, corev1.EnvVar{ - Name: envoyPodEnvVar, - ValueFrom: &corev1.EnvVarSource{ - FieldRef: &corev1.ObjectFieldSelector{ - APIVersion: "v1", - FieldPath: "metadata.name", - }, - }, - }) - if containerSpec != nil { return resource.ExpectedContainerEnv(containerSpec, env) } else { diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/component-level.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/component-level.yaml index cc5ab6476c..fdb9c87c94 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/component-level.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/component-level.yaml @@ -45,18 +45,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -129,18 +132,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml index 4603f72470..acd5a84a79 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml @@ -211,18 +211,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: envoyproxy/envoy:v1.2.3 imagePullPolicy: IfNotPresent lifecycle: @@ -289,18 +292,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml index a1a4d9bf99..5c74d5b9f7 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml @@ -210,18 +210,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: envoyproxy/envoy:v1.2.3 imagePullPolicy: IfNotPresent lifecycle: @@ -288,18 +291,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml index b4e83c6d41..2544839f24 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml @@ -195,18 +195,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -279,18 +282,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml index aec6f53363..a228cb0c48 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml @@ -144,18 +144,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -225,18 +228,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml index f6a59ef158..7e998d2ac0 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml @@ -210,18 +210,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - name: env_a value: env_a_value - name: env_b @@ -292,18 +295,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/gateway-namespace-mode.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/gateway-namespace-mode.yaml index 9cc6bf73e9..9290f81106 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/gateway-namespace-mode.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/gateway-namespace-mode.yaml @@ -213,18 +213,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -300,18 +303,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml index ddefe90b01..f83c3e1e9a 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 @@ -204,18 +204,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -288,18 +291,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml index fdb1cd9263..2153fba401 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml @@ -195,18 +195,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -279,18 +282,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml index 0cedfdb140..a8a4bb1afa 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml @@ -195,18 +195,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -284,18 +287,21 @@ spec: value: env_a_value - name: env_b value: env_b_value - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: envoyproxy/gateway-dev:v1.2.3 imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml index 42fb53cf62..fd8ab90a0a 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml @@ -210,18 +210,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - name: env_a value: env_a_value - name: env_b @@ -292,18 +295,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml index 7495912ede..7f16119fd9 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml @@ -200,18 +200,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -284,18 +287,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-concurrency.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-concurrency.yaml index ebb00588f2..ef3337d791 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-concurrency.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-concurrency.yaml @@ -46,18 +46,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -130,18 +133,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml index 5908354597..628613f275 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml @@ -197,18 +197,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -281,18 +284,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml index 279b032854..4796fe3ad3 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 @@ -195,18 +195,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -279,18 +282,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml index 5b461e56d8..22abdf0c14 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml @@ -195,18 +195,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -279,18 +282,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml index 0e87057373..e46725cd0d 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml @@ -195,18 +195,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -279,18 +282,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml index 0fb3224390..8e1e6fb62b 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 @@ -195,18 +195,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -279,18 +282,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/bootstrap.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/bootstrap.yaml index 20dd5a04c1..76fdff873c 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/bootstrap.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/bootstrap.yaml @@ -49,18 +49,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -133,18 +136,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/component-level.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/component-level.yaml index f4033ecaac..79a3682873 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/component-level.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/component-level.yaml @@ -49,18 +49,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -133,18 +136,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml index b93281c308..31c2be0db4 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml @@ -216,18 +216,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: envoyproxy/envoy:v1.2.3 imagePullPolicy: IfNotPresent lifecycle: @@ -294,18 +297,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml index 99d3b24f2a..947ad02af9 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml @@ -216,18 +216,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: envoyproxy/envoy:v1.2.3 imagePullPolicy: IfNotPresent lifecycle: @@ -296,18 +299,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml index b338506c9f..577a210ae6 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml @@ -215,18 +215,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: envoyproxy/envoy:v1.2.3 imagePullPolicy: IfNotPresent lifecycle: @@ -293,18 +296,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml index fa52c6862f..c633f85a94 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml @@ -199,18 +199,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -283,18 +286,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml index e32820f4c8..80696224d2 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml @@ -148,18 +148,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -229,18 +232,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml index 8b2443e75b..8999b8856b 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml @@ -200,18 +200,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -284,18 +287,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml index 631aba61f1..1eff3a7663 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml @@ -215,18 +215,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - name: env_a value: env_a_value - name: env_b @@ -297,18 +300,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/gateway-namespace-mode.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/gateway-namespace-mode.yaml index 969057ace2..6e3c598a31 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/gateway-namespace-mode.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/gateway-namespace-mode.yaml @@ -217,18 +217,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -304,18 +307,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml index ae2405c92a..36c2998330 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml @@ -200,18 +200,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -284,18 +287,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml index 4200837e6e..9e4b17ddbc 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 @@ -208,18 +208,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -292,18 +295,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml index fe7d322b88..32522d2478 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml @@ -199,18 +199,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -283,18 +286,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml index c87d95c8b8..0a3aa7ffb7 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml @@ -199,18 +199,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -288,18 +291,21 @@ spec: value: env_a_value - name: env_b value: env_b_value - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: privaterepo/envoyproxy/gateway-dev:v1.2.3 imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml index 6eecc815be..9899b67d01 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml @@ -215,18 +215,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] - name: env_a value: env_a_value - name: env_b @@ -297,18 +300,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml index f88b710cf4..b8e4607459 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml @@ -204,18 +204,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -288,18 +291,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-concurrency.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-concurrency.yaml index 94be02ee5f..e9e7a3fa88 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-concurrency.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-concurrency.yaml @@ -50,18 +50,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -134,18 +137,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml index 31f98d5e07..ae87e591b0 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 @@ -199,18 +199,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -282,18 +285,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml index 5d8cb792a8..e34414745d 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml @@ -201,18 +201,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -285,18 +288,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml index 9fd95327a3..5d44067c21 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 @@ -199,18 +199,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -283,18 +286,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml index a514ea8cf5..ab618f5862 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml @@ -199,18 +199,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -283,18 +286,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml index 7748279a70..2f12ddcb5d 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml @@ -199,18 +199,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -283,18 +286,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml index fcda05eebc..568e8be69a 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 @@ -199,18 +199,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -283,18 +286,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/gateway-namespace-mode/deployment.yaml b/internal/infrastructure/kubernetes/proxy/testdata/gateway-namespace-mode/deployment.yaml index 710787b20f..26d7f68b06 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/gateway-namespace-mode/deployment.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/gateway-namespace-mode/deployment.yaml @@ -217,18 +217,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -304,18 +307,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: @@ -621,18 +627,21 @@ spec: command: - envoy env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/envoy:distroless-dev imagePullPolicy: IfNotPresent lifecycle: @@ -708,18 +717,21 @@ spec: command: - envoy-gateway env: - - name: ENVOY_GATEWAY_NAMESPACE - value: envoy-gateway-system - - name: ENVOY_SERVICE_ZONE + - name: ENVOY_POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 - fieldPath: metadata.annotations['topology.kubernetes.io/zone'] + fieldPath: metadata.namespace - name: ENVOY_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + - name: ENVOY_SERVICE_ZONE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.annotations['topology.kubernetes.io/zone'] image: docker.io/envoyproxy/gateway-dev:latest imagePullPolicy: IfNotPresent lifecycle: diff --git a/internal/xds/translator/accesslog.go b/internal/xds/translator/accesslog.go index 552ea41df1..5473645b9d 100644 --- a/internal/xds/translator/accesslog.go +++ b/internal/xds/translator/accesslog.go @@ -478,7 +478,7 @@ func convertToKeyValueList(attributes map[string]string, additionalLabels bool) // TODO: check the provider type and set the appropriate attributes keyValueList.Values = append(keyValueList.Values, &otlpcommonv1.KeyValue{ Key: k8sNamespaceNameKey, - Value: &otlpcommonv1.AnyValue{Value: &otlpcommonv1.AnyValue_StringValue{StringValue: "%ENVIRONMENT(ENVOY_GATEWAY_NAMESPACE)%"}}, + Value: &otlpcommonv1.AnyValue{Value: &otlpcommonv1.AnyValue_StringValue{StringValue: "%ENVIRONMENT(ENVOY_POD_NAMESPACE)%"}}, }) keyValueList.Values = append(keyValueList.Values, &otlpcommonv1.KeyValue{ diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.listeners.yaml index 82af12d133..6739031b0f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.listeners.yaml @@ -58,7 +58,7 @@ values: - key: k8s.namespace.name value: - stringValue: '%ENVIRONMENT(ENVOY_GATEWAY_NAMESPACE)%' + stringValue: '%ENVIRONMENT(ENVOY_POD_NAMESPACE)%' - key: k8s.pod.name value: stringValue: '%ENVIRONMENT(ENVOY_POD_NAME)%' @@ -134,7 +134,7 @@ values: - key: k8s.namespace.name value: - stringValue: '%ENVIRONMENT(ENVOY_GATEWAY_NAMESPACE)%' + stringValue: '%ENVIRONMENT(ENVOY_POD_NAMESPACE)%' - key: k8s.pod.name value: stringValue: '%ENVIRONMENT(ENVOY_POD_NAME)%' diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.listeners.yaml index ac530c829e..e2ee899af5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.listeners.yaml @@ -37,7 +37,7 @@ values: - key: k8s.namespace.name value: - stringValue: '%ENVIRONMENT(ENVOY_GATEWAY_NAMESPACE)%' + stringValue: '%ENVIRONMENT(ENVOY_POD_NAMESPACE)%' - key: k8s.pod.name value: stringValue: '%ENVIRONMENT(ENVOY_POD_NAME)%' @@ -95,7 +95,7 @@ values: - key: k8s.namespace.name value: - stringValue: '%ENVIRONMENT(ENVOY_GATEWAY_NAMESPACE)%' + stringValue: '%ENVIRONMENT(ENVOY_POD_NAMESPACE)%' - key: k8s.pod.name value: stringValue: '%ENVIRONMENT(ENVOY_POD_NAME)%' diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.listeners.yaml index 7e51cbeb1d..6e500f3c5e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.listeners.yaml @@ -57,7 +57,7 @@ values: - key: k8s.namespace.name value: - stringValue: '%ENVIRONMENT(ENVOY_GATEWAY_NAMESPACE)%' + stringValue: '%ENVIRONMENT(ENVOY_POD_NAMESPACE)%' - key: k8s.pod.name value: stringValue: '%ENVIRONMENT(ENVOY_POD_NAME)%' @@ -141,7 +141,7 @@ values: - key: k8s.namespace.name value: - stringValue: '%ENVIRONMENT(ENVOY_GATEWAY_NAMESPACE)%' + stringValue: '%ENVIRONMENT(ENVOY_POD_NAMESPACE)%' - key: k8s.pod.name value: stringValue: '%ENVIRONMENT(ENVOY_POD_NAME)%' diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.listeners.yaml index f1efd67797..43694629e0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.listeners.yaml @@ -73,7 +73,7 @@ values: - key: k8s.namespace.name value: - stringValue: '%ENVIRONMENT(ENVOY_GATEWAY_NAMESPACE)%' + stringValue: '%ENVIRONMENT(ENVOY_POD_NAMESPACE)%' - key: k8s.pod.name value: stringValue: '%ENVIRONMENT(ENVOY_POD_NAME)%' @@ -170,7 +170,7 @@ values: - key: k8s.namespace.name value: - stringValue: '%ENVIRONMENT(ENVOY_GATEWAY_NAMESPACE)%' + stringValue: '%ENVIRONMENT(ENVOY_POD_NAMESPACE)%' - key: k8s.pod.name value: stringValue: '%ENVIRONMENT(ENVOY_POD_NAME)%' diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-types.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-types.listeners.yaml index 9b89cf5c79..3a120ea85e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-types.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-types.listeners.yaml @@ -116,7 +116,7 @@ values: - key: k8s.namespace.name value: - stringValue: '%ENVIRONMENT(ENVOY_GATEWAY_NAMESPACE)%' + stringValue: '%ENVIRONMENT(ENVOY_POD_NAMESPACE)%' - key: k8s.pod.name value: stringValue: '%ENVIRONMENT(ENVOY_POD_NAME)%' @@ -146,7 +146,7 @@ values: - key: k8s.namespace.name value: - stringValue: '%ENVIRONMENT(ENVOY_GATEWAY_NAMESPACE)%' + stringValue: '%ENVIRONMENT(ENVOY_POD_NAMESPACE)%' - key: k8s.pod.name value: stringValue: '%ENVIRONMENT(ENVOY_POD_NAME)%' @@ -276,7 +276,7 @@ values: - key: k8s.namespace.name value: - stringValue: '%ENVIRONMENT(ENVOY_GATEWAY_NAMESPACE)%' + stringValue: '%ENVIRONMENT(ENVOY_POD_NAMESPACE)%' - key: k8s.pod.name value: stringValue: '%ENVIRONMENT(ENVOY_POD_NAME)%' @@ -302,7 +302,7 @@ values: - key: k8s.namespace.name value: - stringValue: '%ENVIRONMENT(ENVOY_GATEWAY_NAMESPACE)%' + stringValue: '%ENVIRONMENT(ENVOY_POD_NAMESPACE)%' - key: k8s.pod.name value: stringValue: '%ENVIRONMENT(ENVOY_POD_NAME)%' diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.listeners.yaml index 20adb39d58..82d7bc9277 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.listeners.yaml @@ -56,7 +56,7 @@ values: - key: k8s.namespace.name value: - stringValue: '%ENVIRONMENT(ENVOY_GATEWAY_NAMESPACE)%' + stringValue: '%ENVIRONMENT(ENVOY_POD_NAMESPACE)%' - key: k8s.pod.name value: stringValue: '%ENVIRONMENT(ENVOY_POD_NAME)%' @@ -129,7 +129,7 @@ values: - key: k8s.namespace.name value: - stringValue: '%ENVIRONMENT(ENVOY_GATEWAY_NAMESPACE)%' + stringValue: '%ENVIRONMENT(ENVOY_POD_NAMESPACE)%' - key: k8s.pod.name value: stringValue: '%ENVIRONMENT(ENVOY_POD_NAME)%' diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml index 71f4affea9..edd3542f3d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml @@ -56,7 +56,7 @@ values: - key: k8s.namespace.name value: - stringValue: '%ENVIRONMENT(ENVOY_GATEWAY_NAMESPACE)%' + stringValue: '%ENVIRONMENT(ENVOY_POD_NAMESPACE)%' - key: k8s.pod.name value: stringValue: '%ENVIRONMENT(ENVOY_POD_NAME)%' @@ -129,7 +129,7 @@ values: - key: k8s.namespace.name value: - stringValue: '%ENVIRONMENT(ENVOY_GATEWAY_NAMESPACE)%' + stringValue: '%ENVIRONMENT(ENVOY_POD_NAMESPACE)%' - key: k8s.pod.name value: stringValue: '%ENVIRONMENT(ENVOY_POD_NAME)%' diff --git a/internal/xds/translator/testdata/out/xds-ir/dns-lookup-family.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/dns-lookup-family.listeners.yaml index cb9e097946..89e04f85a6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/dns-lookup-family.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/dns-lookup-family.listeners.yaml @@ -58,7 +58,7 @@ values: - key: k8s.namespace.name value: - stringValue: '%ENVIRONMENT(ENVOY_GATEWAY_NAMESPACE)%' + stringValue: '%ENVIRONMENT(ENVOY_POD_NAMESPACE)%' - key: k8s.pod.name value: stringValue: '%ENVIRONMENT(ENVOY_POD_NAME)%' @@ -101,7 +101,7 @@ values: - key: k8s.namespace.name value: - stringValue: '%ENVIRONMENT(ENVOY_GATEWAY_NAMESPACE)%' + stringValue: '%ENVIRONMENT(ENVOY_POD_NAMESPACE)%' - key: k8s.pod.name value: stringValue: '%ENVIRONMENT(ENVOY_POD_NAME)%' diff --git a/site/content/en/latest/tasks/observability/proxy-trace.md b/site/content/en/latest/tasks/observability/proxy-trace.md index e4b43d4434..054e9fb5e6 100644 --- a/site/content/en/latest/tasks/observability/proxy-trace.md +++ b/site/content/en/latest/tasks/observability/proxy-trace.md @@ -72,7 +72,7 @@ spec: "k8s.namespace.name": type: Environment environment: - name: ENVOY_GATEWAY_NAMESPACE + name: ENVOY_POD_NAMESPACE defaultValue: "envoy-gateway-system" # This is an example of using a header value as a tag value header1: @@ -138,7 +138,7 @@ spec: "k8s.namespace.name": type: Environment environment: - name: ENVOY_GATEWAY_NAMESPACE + name: ENVOY_POD_NAMESPACE defaultValue: "envoy-gateway-system" # This is an example of using a header value as a tag value header1: @@ -202,7 +202,7 @@ spec: "k8s.namespace.name": type: Environment environment: - name: ENVOY_GATEWAY_NAMESPACE + name: ENVOY_POD_NAMESPACE defaultValue: "envoy-gateway-system" # This is an example of using a header value as a tag value header1: @@ -277,7 +277,7 @@ spec: "k8s.namespace.name": type: Environment environment: - name: ENVOY_GATEWAY_NAMESPACE + name: ENVOY_POD_NAMESPACE defaultValue: "envoy-gateway-system" # This is an example of using a header value as a tag value header1: @@ -336,7 +336,7 @@ spec: "k8s.namespace.name": type: Environment environment: - name: ENVOY_GATEWAY_NAMESPACE + name: ENVOY_POD_NAMESPACE defaultValue: "envoy-gateway-system" # This is an example of using a header value as a tag value header1: @@ -348,4 +348,4 @@ EOF ``` -[envoy-proxy-crd]: ../../api/extension_types#envoyproxy \ No newline at end of file +[envoy-proxy-crd]: ../../api/extension_types#envoyproxy diff --git a/site/content/en/latest/tasks/operations/customize-envoyproxy.md b/site/content/en/latest/tasks/operations/customize-envoyproxy.md index 561d1d9a42..e183ea8960 100644 --- a/site/content/en/latest/tasks/operations/customize-envoyproxy.md +++ b/site/content/en/latest/tasks/operations/customize-envoyproxy.md @@ -375,7 +375,7 @@ spec: {{% /tab %}} {{< /tabpane >}} -> Envoy Gateway has provided two initial `env` `ENVOY_GATEWAY_NAMESPACE` and `ENVOY_POD_NAME` for envoyproxy container. +> Envoy Gateway has provided two initial `env` `ENVOY_POD_NAMESPACE` and `ENVOY_POD_NAME` for envoyproxy container. After applying the config, you can get the envoyproxy deployment, and see resources has been changed. @@ -513,7 +513,7 @@ apiVersion: gateway.envoyproxy.io/v1alpha1 kind: EnvoyProxy metadata: name: custom-proxy-config - namespace: default + namespace: default spec: bootstrap: type: Replace @@ -733,7 +733,7 @@ apiVersion: gateway.envoyproxy.io/v1alpha1 kind: EnvoyProxy metadata: name: custom-proxy-config - namespace: default + namespace: default spec: bootstrap: type: JSONPatch @@ -787,7 +787,7 @@ apiVersion: gateway.envoyproxy.io/v1alpha1 kind: EnvoyProxy metadata: name: custom-proxy-config - namespace: default + namespace: default spec: provider: type: Kubernetes @@ -815,7 +815,7 @@ apiVersion: gateway.envoyproxy.io/v1alpha1 kind: EnvoyProxy metadata: name: custom-proxy-config - namespace: default + namespace: default spec: provider: type: Kubernetes @@ -851,10 +851,10 @@ apiVersion: gateway.envoyproxy.io/v1alpha1 kind: EnvoyProxy metadata: name: custom-proxy-config - namespace: default + namespace: default spec: extraArgs: - - --disable-extensions envoy.access_loggers/envoy.access_loggers.wasm + - --disable-extensions envoy.access_loggers/envoy.access_loggers.wasm EOF ``` @@ -868,10 +868,10 @@ apiVersion: gateway.envoyproxy.io/v1alpha1 kind: EnvoyProxy metadata: name: custom-proxy-config - namespace: default + namespace: default spec: extraArgs: - - --disable-extensions envoy.access_loggers/envoy.access_loggers.wasm + - --disable-extensions envoy.access_loggers/envoy.access_loggers.wasm ``` {{% /tab %}} @@ -894,7 +894,7 @@ apiVersion: gateway.envoyproxy.io/v1alpha1 kind: EnvoyProxy metadata: name: eg - namespace: default + namespace: default spec: provider: type: Kubernetes @@ -1036,7 +1036,7 @@ By default, Envoy Gateway applies the following filters in the order shown: * envoy.filters.http.ratelimit * envoy.filters.http.router -The default order in which these filters are applied is opinionated and may not suit all use cases. +The default order in which these filters are applied is opinionated and may not suit all use cases. To address this, Envoy Gateway allows you to adjust the execution order of these filters with the `filterOrder` field in the [EnvoyProxy][] resource. `filterOrder` is a list of customized filter order configurations. Each configuration can specify a filter @@ -1137,4 +1137,4 @@ After applying the config, the EnvoyProxy deployment will be configured to use t [Gateway API documentation]: https://gateway-api.sigs.k8s.io/ [EnvoyProxy]: ../../../api/extension_types#envoyproxy -[egctl x translate]: ../operations/egctl#egctl-experimental-translate \ No newline at end of file +[egctl x translate]: ../operations/egctl#egctl-experimental-translate diff --git a/test/e2e/testdata/btp-tracing.yaml b/test/e2e/testdata/btp-tracing.yaml index 460d0357b8..9cd3385cd9 100644 --- a/test/e2e/testdata/btp-tracing.yaml +++ b/test/e2e/testdata/btp-tracing.yaml @@ -49,7 +49,7 @@ spec: "k8s.namespace.name": type: Environment environment: - name: ENVOY_GATEWAY_NAMESPACE + name: ENVOY_POD_NAMESPACE defaultValue: "envoy-gateway-system" shutdown: drainTimeout: 5s @@ -120,5 +120,5 @@ spec: "k8s.namespace.name": type: Environment environment: - name: ENVOY_GATEWAY_NAMESPACE + name: ENVOY_POD_NAMESPACE defaultValue: "envoy-gateway-system" diff --git a/test/e2e/testdata/tracing-datadog.yaml b/test/e2e/testdata/tracing-datadog.yaml index d20097f206..e3c2a1b6b9 100644 --- a/test/e2e/testdata/tracing-datadog.yaml +++ b/test/e2e/testdata/tracing-datadog.yaml @@ -69,7 +69,7 @@ spec: "k8s.namespace.name": type: Environment environment: - name: ENVOY_GATEWAY_NAMESPACE + name: ENVOY_POD_NAMESPACE defaultValue: "envoy-gateway-system" shutdown: drainTimeout: 5s diff --git a/test/e2e/testdata/tracing-otel.yaml b/test/e2e/testdata/tracing-otel.yaml index dcd579c4d3..6bec4af905 100644 --- a/test/e2e/testdata/tracing-otel.yaml +++ b/test/e2e/testdata/tracing-otel.yaml @@ -49,7 +49,7 @@ spec: "k8s.namespace.name": type: Environment environment: - name: ENVOY_GATEWAY_NAMESPACE + name: ENVOY_POD_NAMESPACE defaultValue: "envoy-gateway-system" shutdown: drainTimeout: 5s diff --git a/test/e2e/testdata/tracing-zipkin.yaml b/test/e2e/testdata/tracing-zipkin.yaml index dc8854e015..2e25caaa4c 100644 --- a/test/e2e/testdata/tracing-zipkin.yaml +++ b/test/e2e/testdata/tracing-zipkin.yaml @@ -58,7 +58,7 @@ spec: "k8s.namespace.name": type: Environment environment: - name: ENVOY_GATEWAY_NAMESPACE + name: ENVOY_POD_NAMESPACE defaultValue: "envoy-gateway-system" shutdown: drainTimeout: 5s diff --git a/test/e2e/tests/accesslog.go b/test/e2e/tests/accesslog.go index b09063c963..3b38e517b6 100644 --- a/test/e2e/tests/accesslog.go +++ b/test/e2e/tests/accesslog.go @@ -123,12 +123,8 @@ var OpenTelemetryTestText = suite.ConformanceTest{ Description: "Make sure OpenTelemetry text access log is working", Manifests: []string{"testdata/accesslog-otel.yaml"}, Test: func(t *testing.T, suite *suite.ConformanceTestSuite) { - labels := map[string]string{ - "k8s_namespace_name": "envoy-gateway-system", - "exporter": "OTLP", - } - ns := "gateway-conformance-infra" + labels := getOTELLabels(ns) routeNN := types.NamespacedName{Name: "accesslog-otel", Namespace: ns} gwNN := types.NamespacedName{Name: "accesslog-gtw", Namespace: ns} gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeAccepted(t, suite.Client, suite.TimeoutConfig, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN) @@ -176,12 +172,8 @@ var OpenTelemetryTestJSONAsDefault = suite.ConformanceTest{ Description: "Make sure OpenTelemetry JSON access log is working as default when no format or type is specified", Manifests: []string{"testdata/accesslog-otel-default.yaml"}, Test: func(t *testing.T, suite *suite.ConformanceTestSuite) { - labels := map[string]string{ - "k8s_namespace_name": "envoy-gateway-system", - "exporter": "OTLP", - } - ns := "gateway-conformance-infra" + labels := getOTELLabels(ns) routeNN := types.NamespacedName{Name: "accesslog-otel", Namespace: ns} gwNN := types.NamespacedName{Name: "accesslog-gtw", Namespace: ns} gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeAccepted(t, suite.Client, suite.TimeoutConfig, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN) @@ -229,12 +221,8 @@ var OpenTelemetryTestJSON = suite.ConformanceTest{ Description: "Make sure OpenTelemetry JSON access log is working with custom JSON attributes", Manifests: []string{"testdata/accesslog-otel-json.yaml"}, Test: func(t *testing.T, suite *suite.ConformanceTestSuite) { - labels := map[string]string{ - "k8s_namespace_name": "envoy-gateway-system", - "exporter": "OTLP", - } - ns := "gateway-conformance-infra" + labels := getOTELLabels(ns) routeNN := types.NamespacedName{Name: "accesslog-otel", Namespace: ns} gwNN := types.NamespacedName{Name: "accesslog-gtw", Namespace: ns} gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeAccepted(t, suite.Client, suite.TimeoutConfig, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN) @@ -313,6 +301,21 @@ var ALSTest = suite.ConformanceTest{ }, } +// getOTELLabels returns the appropriate OpenTelemetry labels based on gateway namespace mode +func getOTELLabels(testNamespace string) map[string]string { + if IsGatewayNamespaceMode() { + return map[string]string{ + "k8s_namespace_name": testNamespace, + "exporter": "OTLP", + } + } + + return map[string]string{ + "k8s_namespace_name": "envoy-gateway-system", + "exporter": "OTLP", + } +} + func runLogTest(t *testing.T, suite *suite.ConformanceTestSuite, gwAddr string, expectedResponse httputils.ExpectedResponse, expectedLabels map[string]string, expectedMatch string, expectedDelta int, ) { diff --git a/test/fuzz/testdata/FuzzGatewayAPIToXDS/proxy_tracing b/test/fuzz/testdata/FuzzGatewayAPIToXDS/proxy_tracing index b9c8baa433..57904783bd 100644 --- a/test/fuzz/testdata/FuzzGatewayAPIToXDS/proxy_tracing +++ b/test/fuzz/testdata/FuzzGatewayAPIToXDS/proxy_tracing @@ -40,11 +40,11 @@ spec: "k8s.namespace.name": type: Environment environment: - name: ENVOY_GATEWAY_NAMESPACE + name: ENVOY_POD_NAMESPACE defaultValue: "envoy-gateway-system" # This is an example of using a header value as a tag value header1: type: RequestHeader requestHeader: name: X-Header-1 - defaultValue: "-" \ No newline at end of file + defaultValue: "-"