chart: additional envFrom configmap (#61)

DefGuard · Sep 10, 2024 · d971d8b · d971d8b
1 parent 9456696
commit d971d8b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 1 deletion.
diff --git a/charts/defguard-proxy/templates/deployment.yaml b/charts/defguard-proxy/templates/deployment.yaml
@@ -32,6 +32,10 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "defguard-proxy.fullname" . }}-config
+            {{- if .Values.additionalEnvFromConfigMap }}
+            - configMapRef:
+                name: {{ .Values.additionalEnvFromConfigMap }}
+            {{- end }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"

diff --git a/charts/defguard-proxy/values.yaml b/charts/defguard-proxy/values.yaml
@@ -40,3 +40,4 @@ serviceAccount:
   annotations: {}
   create: true
 tolerations: []
+additionalEnvFromConfigMap: ""
diff --git a/charts/defguard/Chart.yaml b/charts/defguard/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: defguard
-description: Defguard is an open-source enterprise wireGuard VPN with MFA and SSO 
+description: Defguard is an open-source enterprise wireGuard VPN with MFA and SSO
 
 type: application
 version: 0.7.7

diff --git a/charts/defguard/templates/defguard-deployment.yaml b/charts/defguard/templates/defguard-deployment.yaml
@@ -60,6 +60,10 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "defguard.fullname" . }}-config
+            {{- if .Values.additionalEnvFromConfigMap }}
+            - configMapRef:
+                name: {{ .Values.additionalEnvFromConfigMap }}
+            {{- end }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"

diff --git a/charts/defguard/values.yaml b/charts/defguard/values.yaml
@@ -73,3 +73,4 @@ defguard-proxy:
       host: defguard-proxy-grpc.local
     web:
       host: enrollment.local
+additionalEnvFromConfigMap: ""