From d35bf95aab017d734bb09265456a57a4ba9194c8 Mon Sep 17 00:00:00 2001 From: Jamie White Date: Fri, 8 Apr 2022 12:46:05 +0200 Subject: [PATCH] builtin/k8s: Ensure pod.container.static_environment is applied --- .changelog/3197.txt | 3 +++ builtin/k8s/platform.go | 5 +++++ 2 files changed, 8 insertions(+) create mode 100644 .changelog/3197.txt diff --git a/.changelog/3197.txt b/.changelog/3197.txt new file mode 100644 index 00000000000..95b2f668ec9 --- /dev/null +++ b/.changelog/3197.txt @@ -0,0 +1,3 @@ +```release-note:bug +builtin/k8s: Ensure pod.container.static_environment is applied +``` diff --git a/builtin/k8s/platform.go b/builtin/k8s/platform.go index 92512c18d2e..8bc1518d3bb 100644 --- a/builtin/k8s/platform.go +++ b/builtin/k8s/platform.go @@ -640,6 +640,11 @@ func (p *Platform) resourceDeploymentCreate( for k, v := range p.config.StaticEnvVars { envVars[k] = v } + if p.config.Pod != nil && p.config.Pod.Container != nil { + for k, v := range p.config.Pod.Container.StaticEnvVars { + envVars[k] = v + } + } for k, v := range deployConfig.Env() { envVars[k] = v }