[monochart] Add envFrom section (#231)

* [monochart] Add `envFrom` section * [monochart] Add `envFrom` section
cloudposse · Mar 11, 2020 · df2e4c8 · df2e4c8
1 parent 63fe75e
commit df2e4c8
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 5 deletions.
diff --git a/incubator/monochart/Chart.yaml b/incubator/monochart/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 description: A declarative helm chart for deploying common types of services on Kubernetes
 name: monochart
-version: 0.18.4
-appVersion: 0.18.4
+version: 0.19.0
+appVersion: 0.19.0
 home: https://github.com/cloudposse/charts/tree/master/incubator/monochart
 icon: https://raw.githubusercontent.com/cloudposse/charts/master/incubator/monochart/logo.png
 maintainers:

diff --git a/incubator/monochart/templates/_helpers.tpl b/incubator/monochart/templates/_helpers.tpl
@@ -49,6 +49,16 @@ env:
     value: {{ default "" $value | quote }}
 {{- end }}
 {{- end }}
+{{- with $root.Values.envFrom }}
+{{- range $name := .configMaps -}}
+- configMapRef:
+    name: {{ $name }}
+{{- end }}
+{{- range $name := .secrets -}}
+- secretRef:
+    name: {{ $name }}
+{{- end }}
+{{- end }}
 {{- end -}}
 
 

diff --git a/incubator/monochart/values.example.yaml b/incubator/monochart/values.example.yaml
@@ -45,10 +45,19 @@ secrets:
       secret.test.txt: |-
         some text
 
-# Inline environment
+# Inline ENV variables
 env:
   INLINE_ENV_NAME: ENV_VALUE
 
+# ENV variables from existing Kubernetes secrets and ConfigMaps
+envFrom:
+  secrets:
+    - secret-1
+    - secret-2
+  configMaps:
+    - config-1
+    - config-2
+
 deployment:
   enabled: true
   ## Pods replace strategy

diff --git a/incubator/monochart/values.yaml b/incubator/monochart/values.yaml
@@ -51,10 +51,19 @@ secrets:
   #         group:
   #           key: value
 
-# Inline environment
+# Inline ENV variables
 env:
   # ENV_NAME: ENV_VALUE
 
+# ENV variables from existing Kubernetes secrets and ConfigMaps
+#envFrom:
+#  secrets:
+#    - secret-1
+#    - secret-2
+#  configMaps:
+#    - config-1
+#    - config-2
+
 deployment:
   enabled: false
   ## Pods replace strategy
@@ -407,4 +416,4 @@ crd:
 #                name: https
 #                protocol: HTTPS
 #            location: MESH_EXTERNAL
-#            resolution: DNS
+#            resolution: DNS