Merge pull request #31 from bokristoffersson/environment-configmap

Store environment variables in a configmap
curityio · Dec 10, 2021 · 710ad2c · 710ad2c
2 parents 7a01f86 + a17e40e
commit 710ad2c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/idsvr/README.md b/idsvr/README.md
@@ -92,7 +92,8 @@ Parameter | Description | Default
 `curity.config.uiEnabled`| Flag to enable/disable the service for Admin UI and Admin REST API |`false`
 `curity.config.password`| The administrator password. Required if `curity.config.environmentVariableSecret` and `curity.config.configurationSecret` is not set | `null`
 `curity.config.encryptionKey`| The configuration encryption key |`null`
-`curity.config.environmentVariableSecret`| The data from this Secret will be mounted as environment variables |`null`
+`curity.config.environmentVariableSecret`| The data from this Secret will be mounted as environment variables |`null` 
+`curity.config.environmentVariableConfigMap`| The data from this ConfigMap will be mounted as environment variables |`null`
 `curity.config.configurationSecret`| The Secret containing configuration which is mounted as a volume  |`null`
 `curity.config.configurationSecretItemName`| The `curity.config.configurationSecret`'s item name, required if the Secret is set. |`null`
 `curity.config.configurationConfigMap`| The ConfigMap containing configuration which is mounted as a volume  |`null`

diff --git a/idsvr/templates/deployment-admin.yaml b/idsvr/templates/deployment-admin.yaml
@@ -54,11 +54,17 @@ spec:
             - name: {{ $env.name }}
               value: {{ $env.value | quote }}
           {{- end }}
-          {{- if .Values.curity.config.environmentVariableSecret }}
+          {{- if ( or .Values.curity.config.environmentVariableSecret .Values.curity.config.environmentVariableConfigMap ) }}
           envFrom:
+          {{- if .Values.curity.config.environmentVariableConfigMap }}
+            - configMapRef:
+                name: {{ .Values.curity.config.environmentVariableConfigMap | quote }}
+          {{- end }}
+          {{- if .Values.curity.config.environmentVariableSecret }}
             - secretRef:
                 name: {{ .Values.curity.config.environmentVariableSecret | quote }}
           {{- end }}
+          {{- end }}
           ports:
             - name: config-port
               containerPort: {{ .Values.curity.admin.service.port }}

diff --git a/idsvr/templates/deployment-runtime.yaml b/idsvr/templates/deployment-runtime.yaml
@@ -40,11 +40,17 @@ spec:
             - name: {{ $env.name }}
               value: {{ $env.value | quote }}
             {{- end }}
-          {{- if .Values.curity.config.environmentVariableSecret }}
+          {{- if ( or .Values.curity.config.environmentVariableSecret .Values.curity.config.environmentVariableConfigMap ) }}
           envFrom:
+          {{- if .Values.curity.config.environmentVariableConfigMap }}
+            - configMapRef:
+                name: {{ .Values.curity.config.environmentVariableConfigMap | quote }}
+          {{- end }}
+          {{- if .Values.curity.config.environmentVariableSecret }}
             - secretRef:
                 name: {{ .Values.curity.config.environmentVariableSecret | quote }}
           {{- end }}
+          {{- end }}
           ports:
             - name: http-port
               containerPort: {{ .Values.curity.runtime.deployment.port }}

diff --git a/idsvr/values.yaml b/idsvr/values.yaml
@@ -96,6 +96,7 @@ curity:
     password:
     encryptionKey:
     environmentVariableSecret:
+    environmentVariableConfigMap:
     configurationConfigMap:
     configurationConfigMapItemName:
     configurationSecret: