feat(cf-common): merge .env with .container.env (#4)

* feat(cf-common): merge .env with .container.env

* bump version

* clean up

Author: mikhail-klimko

charts/cf-common-test/tests/deployment/container_test.yaml

@@ -60,6 +60,23 @@ tests:
           path: spec.template.spec.containers[0].env[0].value
           value: BOB
 
+  # For backward compatibility
+  - it: Test .Values.env precedence over .Values.container.env
+    values:
+      - values.yaml
+    set:
+      container:
+        env:
+          SERVICE_ROLE: all
+      env:
+        SERVICE_ROLE: internal
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: SERVICE_ROLE
+            value: internal
+
   - it: Test main container TPL Env
     values:
       - values.yaml

charts/cf-common/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v0.0.0
 description: Codefresh library chart
 name: cf-common
-version: 0.0.3
+version: 0.0.4
 type: library
 keywords:
   - codefresh

charts/cf-common/README.md

@@ -2,7 +2,7 @@
 
 Codefresh library chart
 
-![Version: 0.0.3](https://img.shields.io/badge/Version-0.0.3-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: v0.0.0](https://img.shields.io/badge/AppVersion-v0.0.0-informational?style=flat-square)
+![Version: 0.0.4](https://img.shields.io/badge/Version-0.0.4-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: v0.0.0](https://img.shields.io/badge/AppVersion-v0.0.0-informational?style=flat-square)
 
 ## Installing the Chart
 
@@ -18,7 +18,7 @@ Include this chart as a dependency in your `Chart.yaml` e.g.
 # Chart.yaml
 dependencies:
 - name: cf-common
-  version: 0.0.3
+  version: 0.0.4
   repository: https://chartmuseum.codefresh.io/cf-common
 ```
 

charts/cf-common/templates/container/_container.tpl

@@ -55,16 +55,15 @@ Usage:
   {{- end }}
 
   {{- with .Values.env }}
-  env:
-  {{- include "cf-common.env-vars" (dict "Values" . "context" $) | trim | nindent 2 }}
-  {{- /* For backward compatibility */}}
+{{- /*
+For backward compatibility (.Values.env takes precedence over .Values.container.env)
+*/}}
+  {{- $mergedEnv := . }}
     {{- if $.Values.env }}
-  {{- include "cf-common.env-vars" (dict "Values" $.Values.env "context" $) | trim | nindent 2 }}
+  {{- $mergedEnv = mergeOverwrite . $.Values.env }}
     {{- end }}
-  {{- end }}
-
-  {{- with .Values.extraEnvVars }}
-  {{- include "cf-common.tplrender" (dict "Values" . "context" $) | trim | nindent 2 }}
+  env:
+  {{- include "cf-common.env-vars" (dict "Values" $mergedEnv "context" $) | trim | nindent 2 }}
   {{- end }}
 
   ports: {{- include "cf-common.ports" $ | trim | nindent 2 }}