[common] Fix env vars even more

k8s-at-home · Aug 2, 2022 · 9710bde · 9710bde
1 parent 78ee353
commit 9710bde
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 3 deletions.
diff --git a/charts/stable/common/Chart.yaml b/charts/stable/common/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: common
 description: Function library for k8s-at-home charts
 type: library
-version: 4.5.1
+version: 4.5.2
 kubeVersion: ">=1.16.0-0"
 keywords:
   - k8s-at-home

diff --git a/charts/stable/common/README.md b/charts/stable/common/README.md
@@ -1,6 +1,6 @@
 # common
 
-![Version: 4.5.1](https://img.shields.io/badge/Version-4.5.1-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square)
+![Version: 4.5.2](https://img.shields.io/badge/Version-4.5.2-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square)
 
 Function library for k8s-at-home charts
 
@@ -237,6 +237,12 @@ All notable changes to this library Helm chart will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [4.5.2]
+
+#### Fixed
+
+- Fixed environment variable processing logic for main container when initContainers or additionalContainers were set.
+
 ### [4.5.1]
 
 #### Fixed
@@ -563,4 +569,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Join our [Discord](https://discord.gg/sTMX7Vh) community
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)
+Autogenerated from chart metadata using [helm-docs v0.1.1](https://github.com/k8s-at-home/helm-docs/releases/v0.1.1)
diff --git a/charts/stable/common/README_CHANGELOG.md.gotmpl b/charts/stable/common/README_CHANGELOG.md.gotmpl
@@ -10,6 +10,12 @@ All notable changes to this library Helm chart will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [4.5.2]
+
+#### Fixed
+
+- Fixed environment variable processing logic for main container when initContainers or additionalContainers were set.
+
 ### [4.5.1]
 
 #### Fixed

diff --git a/charts/stable/common/templates/lib/controller/_pod.tpl b/charts/stable/common/templates/lib/controller/_pod.tpl
@@ -53,6 +53,7 @@ initContainers:
       {{- if $container.env -}}
         {{- $_ := set $ "ObjectValues" (dict "env" $container.env) -}}
         {{- $newEnv := fromYaml (include "common.controller.env_vars" $) -}}
+        {{- $_ := unset $.ObjectValues "env" -}}
         {{- $_ := set $container "env" $newEnv.env }}
       {{- end }}
       {{- $initContainers = append $initContainers $container }}
@@ -71,6 +72,7 @@ containers:
         {{- $_ := set $ "ObjectValues" (dict "env" $container.env) -}}
         {{- $newEnv := fromYaml (include "common.controller.env_vars" $) -}}
         {{- $_ := set $container "env" $newEnv.env }}
+        {{- $_ := unset $.ObjectValues "env" -}}
       {{- end }}
       {{- $additionalContainers = append $additionalContainers $container }}
     {{- end }}

diff --git a/helper-charts/common-test/tests/pod/additionalcontainers_test.yaml b/helper-charts/common-test/tests/pod/additionalcontainers_test.yaml
@@ -46,6 +46,8 @@ tests:
 
   - it: with custom env vars dict should pass
     set:
+      env:
+        main_env: value
       additionalContainers:
         additional1:
           env:
@@ -57,6 +59,12 @@ tests:
       - documentIndex: &DeploymentDocument 0
         isKind:
           of: Deployment
+      - documentIndex: *DeploymentDocument
+        equal:
+          path: spec.template.spec.containers[0].env[0]
+          value:
+            name: main_env
+            value: "value"
       - documentIndex: *DeploymentDocument
         equal:
           path: spec.template.spec.containers[1].env[0]