From ba9028a2c25128ef35adcde7561d02aaedb6565d Mon Sep 17 00:00:00 2001
From: Adrian Berger <adrian.berger@bedag.ch>
Date: Fri, 1 Sep 2023 10:48:49 +0000
Subject: [PATCH] [common]: Fix ability to set configMaps & secret for every
 container in pod

Signed-off-by: Adrian Berger <adrian.berger@bedag.ch>
---
 charts/common/Chart.yaml                | 2 +-
 charts/common/README.md                 | 2 +-
 charts/common/templates/_container.yaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml
index ce7e9bef..5f141efe 100644
--- a/charts/common/Chart.yaml
+++ b/charts/common/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: common
 description: "Bedag's common Helm chart to use for creating other Helm charts"
-version: 10.6.0
+version: 10.6.1
 # A chart can be either an 'application' or a 'library' chart.
 #
 # Application charts are a collection of templates that can be packaged into versioned archives
diff --git a/charts/common/README.md b/charts/common/README.md
index b300b01f..0351a79e 100644
--- a/charts/common/README.md
+++ b/charts/common/README.md
@@ -1,6 +1,6 @@
 # common
 
-![Version: 10.6.0](https://img.shields.io/badge/Version-10.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 10.6.1](https://img.shields.io/badge/Version-10.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 Bedag's common Helm chart to use for creating other Helm charts
 
diff --git a/charts/common/templates/_container.yaml b/charts/common/templates/_container.yaml
index ec158589..55b33a9f 100644
--- a/charts/common/templates/_container.yaml
+++ b/charts/common/templates/_container.yaml
@@ -70,7 +70,7 @@
       subPath: {{ $key }}
     {{- end }}
   {{- end }}
-  {{- if or $containerValues.envSecret $containerValues.envConfigMap }}
+  {{- if or $containerValues.envSecret $containerValues.envConfigMap $controllerValues.envSecret $controllerValues.envConfigMap }}
   envFrom:
     {{- if $controllerValues.envSecret }}
     - secretRef: