Skip to content

remove infra ENVOY_GATEWAY_NAMESPACE and introduce ENVOY_POD_NAMESPACE envVar for accesslog #6221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zirain merged 2 commits into from
May 31, 2025
Merged

remove infra ENVOY_GATEWAY_NAMESPACE and introduce ENVOY_POD_NAMESPACE envVar for accesslog #6221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccebc34
remove infra ENVOY_GATEWAY_NAMESPACE and introduce ENVOY_POD_NAMESPAC…
cnvergence May 29, 2025
a2902f9
fix e2e test
cnvergence May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 21 additions & 17 deletions internal/infrastructure/kubernetes/proxy/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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,
Expand All @@ -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 {
Expand Down
22 changes: 14 additions & 8 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/component-level.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
22 changes: 14 additions & 8 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
22 changes: 14 additions & 8 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
22 changes: 14 additions & 8 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
22 changes: 14 additions & 8 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
22 changes: 14 additions & 8 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
Loading