feat: Environment variables from ConfigMap

resolves #724
hashicorp · Apr 4, 2023 · f549fa4 · f549fa4
1 parent 2c4cd3a
commit f549fa4
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
@@ -896,6 +896,16 @@ Inject extra environment populated by secrets, if populated
 {{- end -}}
 {{- end -}}
 
+{{- define "vault.extraEnvironmentVarsFromConfigMap" -}}
+{{- if .extraEnvironmentVarsFromConfigMap -}}
+envFrom:
+{{- range .extraEnvironmentVarsFromConfigMap }}
+  - configMapRef:
+      name: {{ . }}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
 {{/* Scheme for health check and local endpoint */}}
 {{- define "vault.scheme" -}}
 {{- if .Values.global.tlsDisable -}}

diff --git a/templates/server-statefulset.yaml b/templates/server-statefulset.yaml
@@ -137,6 +137,7 @@ spec:
             {{ template "vault.envs" . }}
             {{- include "vault.extraEnvironmentVars" .Values.server | nindent 12 }}
             {{- include "vault.extraSecretEnvironmentVars" .Values.server | nindent 12 }}
+            {{- include "vault.extraEnvironmentVarsFromConfigMap" .Values.server | nindent 10 }}
           volumeMounts:
           {{ template "vault.mounts" . }}
             - name: home

diff --git a/values.schema.json b/values.schema.json
@@ -620,6 +620,9 @@
                 "extraSecretEnvironmentVars": {
                     "type": "array"
                 },
+                "extraEnvironmentVarsFromConfigMap": {
+                    "type": "array"
+                },
                 "extraVolumes": {
                     "type": "array"
                 },

diff --git a/values.yaml b/values.yaml
@@ -559,6 +559,12 @@ server:
     #   secretName: vault
     #   secretKey: AWS_SECRET_ACCESS_KEY
 
+  # extraEnvironmentVarsFromConfigMap is a list of ConfigMap's name whose data as environment variables
+  # to set with the stateful set.
+  extraEnvironmentVarsFromConfigMap: []
+    # - my-configmap
+    # - my-configmap2
+
   # Deprecated: please use 'volumes' instead.
   # extraVolumes is a list of extra volumes to mount. These will be exposed
   # to Vault in the path `/vault/userconfig/<name>/`. The value below is