From 8b21e9f6c74c0b77ac2bd1dad66add4d1f4526c5 Mon Sep 17 00:00:00 2001
From: Bernd Schorgers <me@bjw-s.dev>
Date: Fri, 10 Nov 2023 16:15:29 +0100
Subject: [PATCH] feat(common): Release v2.1.1

---
 charts/library/common/Chart.yaml              |  2 +-
 charts/library/common/README.md               |  4 ++--
 .../templates/lib/container/fields/_env.tpl   | 22 +++++++++----------
 charts/other/app-template/Chart.yaml          |  6 ++---
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index d8f85ce0..3c83ffca 100644
--- a/charts/library/common/Chart.yaml
+++ b/charts/library/common/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 name: common
 description: Function library for Helm charts
 type: library
-version: 2.1.0
+version: 2.1.1
 kubeVersion: ">=1.22.0-0"
 keywords:
   - common
diff --git a/charts/library/common/README.md b/charts/library/common/README.md
index a240a7bc..2bceb0fd 100644
--- a/charts/library/common/README.md
+++ b/charts/library/common/README.md
@@ -1,6 +1,6 @@
 # common
 
-![Version: 2.1.0](https://img.shields.io/badge/Version-2.1.0-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square)
+![Version: 2.1.1](https://img.shields.io/badge/Version-2.1.1-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square)
 
 Function library for Helm charts
 
@@ -27,7 +27,7 @@ Include this chart as a dependency in your `Chart.yaml` e.g.
 # Chart.yaml
 dependencies:
   - name: common
-    version: 2.1.0
+    version: 2.1.1
     repository: https://bjw-s.github.io/helm-charts/
 ```
 
diff --git a/charts/library/common/templates/lib/container/fields/_env.tpl b/charts/library/common/templates/lib/container/fields/_env.tpl
index 650051dc..93cf434c 100644
--- a/charts/library/common/templates/lib/container/fields/_env.tpl
+++ b/charts/library/common/templates/lib/container/fields/_env.tpl
@@ -24,20 +24,18 @@ Env field used by the container.
       {{- $graph := dict -}}
 
       {{- range $name, $var := $containerObject.env -}}
-        {{- if $var -}}
-          {{- if kindIs "map" $var -}}
-            {{- /* Value is a map so ordering can be specified */ -}}
-            {{- if empty (dig "dependsOn" nil $var) -}}
-              {{- $_ := set $graph $name ( list ) -}}
-            {{- else if kindIs "string" $var.dependsOn -}}
-              {{- $_ := set $graph $name ( list $var.dependsOn ) -}}
-            {{- else if kindIs "slice" $var.dependsOn -}}
-              {{- $_ := set $graph $name $var.dependsOn -}}
-            {{- end -}}
-          {{- else -}}
-            {{- /* Value is not a map so no ordering can be specified */ -}}
+        {{- if kindIs "map" $var -}}
+          {{- /* Value is a map so ordering can be specified */ -}}
+          {{- if empty (dig "dependsOn" nil $var) -}}
             {{- $_ := set $graph $name ( list ) -}}
+          {{- else if kindIs "string" $var.dependsOn -}}
+            {{- $_ := set $graph $name ( list $var.dependsOn ) -}}
+          {{- else if kindIs "slice" $var.dependsOn -}}
+            {{- $_ := set $graph $name $var.dependsOn -}}
           {{- end -}}
+        {{- else -}}
+          {{- /* Value is not a map so no ordering can be specified */ -}}
+          {{- $_ := set $graph $name ( list ) -}}
         {{- end -}}
       {{- end -}}
 
diff --git a/charts/other/app-template/Chart.yaml b/charts/other/app-template/Chart.yaml
index 575daff8..7632b6fd 100644
--- a/charts/other/app-template/Chart.yaml
+++ b/charts/other/app-template/Chart.yaml
@@ -2,7 +2,7 @@
 apiVersion: v2
 description: A common powered chart template. This can be useful for small projects that don't have their own chart.
 name: app-template
-version: 2.1.0
+version: 2.1.1
 kubeVersion: ">=1.22.0-0"
 maintainers:
   - name: bjw-s
@@ -10,12 +10,12 @@ maintainers:
 dependencies:
   - name: common
     repository: https://bjw-s.github.io/helm-charts
-    version: 2.1.0
+    version: 2.1.1
 annotations:
   artifacthub.io/changes: |-
     - kind: changed
       description: |
-        Updated library version to 2.1.0.
+        Updated library version to 2.1.1.
       links:
         - name: Upgrade instructions from v1.x
           url: https://github.com/bjw-s/helm-charts/tree/main/charts/other/app-template#from-1xx-to-20x