Add the ability to inject environment variables from a non-helm manag…

…ed configmap
xvilo · Jul 23, 2024 · 9f9aa12 · 9f9aa12
1 parent 63c3ac8
commit 9f9aa12
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 5 deletions.
diff --git a/charts/symfony-app/Chart.yaml b/charts/symfony-app/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: symfony-app
 description: A simple chart to deploy basic Symfony/PHP applications
 type: application
-version: 0.6.0
+version: 0.6.1
 appVersion: 'main'
 keywords:
   - php
@@ -16,5 +16,5 @@ maintainers:
 annotations:
   # Supported kind: added, changed, deprecated, removed, fixed and security
   artifacthub.io/changes: |
-    - kind: removed
-      description: "Removed php-fpm specific image options, for now."
+    - kind: added
+      description: "Added the ability to inject environment variables from a non-helm managed configmap."
diff --git a/charts/symfony-app/templates/deployment.yaml b/charts/symfony-app/templates/deployment.yaml
@@ -50,6 +50,10 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "symfony-app.fullname" . }}-environment
+            {{ range .Values.additionalEnvironmentConfigMaps -}}
+            - configMapRef:
+                name: {{ .name }}
+            {{- end }}
         - name: {{ include "symfony-app.fullname" . }}-php
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
@@ -59,6 +63,10 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "symfony-app.fullname" . }}-environment
+            {{ range .Values.additionalEnvironmentConfigMaps -}}
+            - configMapRef:
+                name: {{ .name }}
+            {{- end }}
           {{- if .Values.source.copyFromFpm }}
           lifecycle:
             postStart:
@@ -101,6 +109,10 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "symfony-app.fullname" . }}-environment
+            {{ range .Values.additionalEnvironmentConfigMaps -}}
+            - configMapRef:
+                name: {{ .name }}
+            {{- end }}
         {{- end }}
         {{- if .Values.composer.autoinstall }}
         - name: dependencies-composer
@@ -116,6 +128,10 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "symfony-app.fullname" . }}-environment
+            {{ range .Values.additionalEnvironmentConfigMaps -}}
+            - configMapRef:
+                name: {{ .name }}
+            {{- end }}
         {{- end }}
       {{- range .Values.initContainers }}
         - name: {{ .name }}

diff --git a/charts/symfony-app/templates/messenger/consumer-deployment.yaml b/charts/symfony-app/templates/messenger/consumer-deployment.yaml
@@ -36,7 +36,14 @@ spec:
         - name: init-fetch-code
           image: {{ (printf "%s:%s" $context.Values.image.git.repository $context.Values.image.git.tag) | quote }}
           workingDir: /app
-          env:
+          envFrom:
+            - configMapRef:
+                name: {{ include "symfony-app.fullname" $ }}-environment
+            {{ range $.Values.additionalEnvironmentConfigMaps -}}
+            - configMapRef:
+                name: {{ .name }}
+            {{- end }}
+          {{- include "symfony-app.env" $context | nindent 10 }}
           volumeMounts:
             - name: app-directory
               mountPath: /app
@@ -48,6 +55,13 @@ spec:
         - name: dependencies-composer
           image: "{{ .Values.image.php.repository }}:{{ .Values.image.php.tag }}"
           workingDir: /app
+          envFrom:
+            - configMapRef:
+                name: {{ include "symfony-app.fullname" $ }}-environment
+            {{ range $.Values.additionalEnvironmentConfigMaps -}}
+            - configMapRef:
+                name: {{ .name }}
+            {{- end }}
           {{- include "symfony-app.env" $context | nindent 10 }}
           volumeMounts:
             - name: app-directory
@@ -60,7 +74,14 @@ spec:
         - name: {{ .name }}
           image: {{ .image | default (printf "%s:%s" $context.Values.image.php.repository $context.Values.image.php.tag) | quote }}
           workingDir: /app
-          {{- include "symfony-app.env" $ | nindent 10 }}
+          envFrom:
+            - configMapRef:
+                name: {{ include "symfony-app.fullname" $ }}-environment
+            {{ range $.Values.additionalEnvironmentConfigMaps -}}
+            - configMapRef:
+                name: {{ .name }}
+            {{- end }}
+          {{- include "symfony-app.env" $context | nindent 10 }}
           volumeMounts:
             - name: app-directory
               mountPath: /app

diff --git a/charts/symfony-app/values.yaml b/charts/symfony-app/values.yaml
@@ -26,6 +26,9 @@ environment: |
   APP_ENV: "prod"
   APP_DEBUG: "0"
 
+additionalEnvironmentConfigMaps: []
+#  - name: my-config-map
+
 ##
 # Only https sources are supported
 source: