feat(helm): simplify environment variable injection using envFrom

Replace manual env variable mapping with Kubernetes-native envFrom
for both irisapp and irisworker deployments. Supports multiple secrets
and improves maintainability of the Helm chart.

Author: ascalotoru

deploy/kubernetes/charts/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
+version: 0.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

deploy/kubernetes/charts/templates/iris_app.yaml

@@ -45,19 +45,13 @@ spec:
           imagePullPolicy: "{{ .Values.irisapp.imagePullPolicy }}"
           command: ['nohup', './iris-entrypoint.sh', 'iriswebapp']
 
-          env:
-          {{- range $key := list "POSTGRES_USER" "POSTGRES_PASSWORD" "POSTGRES_ADMIN_USER" "POSTGRES_ADMIN_PASSWORD" "POSTGRES_PORT" "POSTGRES_SERVER" }}
-          - name: {{ $key }}
-            {{- if and (hasKey $.Values.irisapp "envFromSecret") (has $key $.Values.irisapp.envFromSecret.keys) }}
-            valueFrom:
-              secretKeyRef:
-                name: {{ $.Values.irisapp.envFromSecret.name }}
-                key: {{ $key }}
-            {{- else }}
-            value: {{ index $.Values.irisapp $key | quote }}
-            {{- end }}
+          envFrom:
+          {{- range $.Values.irisapp.envFromSecrets }}
+            - secretRef:
+                name: {{ .name }}
           {{- end }}
 
+
           - name:  IRIS_SECRET_KEY 
             value: {{ .Values.irisapp.IRIS_SECRET_KEY | quote }}
 

deploy/kubernetes/charts/templates/iris_worker.yaml

@@ -43,23 +43,18 @@ spec:
           image: "{{ .Values.irisworker.image}}:{{ .Values.irisworker.tag }}"
           imagePullPolicy: "{{ .Values.irisworker.imagePullPolicy }}"
           command: ['./wait-for-iriswebapp.sh', "{{ .Values.irisapp.name }}:{{ .Values.irisapp.service.port }}", './iris-entrypoint.sh', 'iris-worker']
+          
+          envFrom:
+          {{- range $.Values.irisworker.envFromSecrets }}
+            - secretRef:
+                name: {{ .name }}
+          {{- end }}
 
           env:
 
           - name: DOCKERIZED
             value: {{ .Values.irisworker.DOCKERIZED | quote }}
 
-          {{- range $key := list "POSTGRES_USER" "POSTGRES_PASSWORD" "POSTGRES_ADMIN_USER" "POSTGRES_ADMIN_PASSWORD" "POSTGRES_PORT" "POSTGRES_SERVER" }}
-          - name: {{ $key }}
-            {{- if and (hasKey $.Values.irisworker "envFromSecret") (has $key $.Values.irisworker.envFromSecret.keys) }}
-            valueFrom:
-              secretKeyRef:
-                name: {{ $.Values.irisworker.envFromSecret.name }}
-                key: {{ $key }}
-            {{- else }}
-            value: {{ index $.Values.irisworker $key | quote }}
-            {{- end }}
-          {{- end }}
 
           - name: CELERY_BROKER
             value: {{ .Values.irisworker.CELERY_BROKER | quote }}

deploy/kubernetes/charts/values.yaml

@@ -132,17 +132,11 @@ irisapp:
   DB_RETRY_DELAY: 5
   INTERFACE_HTTPS_PORT: 443
 
-  ## @param irisapp.envFromSecret Environment variables from a secret
-  ##
-  envFromSecret:
-    name: postgres-secret
-    keys:
-      - POSTGRES_USER
-      - POSTGRES_PASSWORD
-      - POSTGRES_ADMIN_USER
-      - POSTGRES_ADMIN_PASSWORD
-      - POSTGRES_PORT
-      - POSTGRES_SERVER
+  ## @param irisapp.envFromSecrets List of secrets to load environment variables from
+  ##
+  envFromSecrets:
+    - name: postgres-secret
+    # - name: extra-secret
 
   ## @param irisapp.securityContext securityContext for irisapp
   ##
@@ -199,17 +193,11 @@ irisworker:
   IRIS_SECRET_KEY: AVerySuperSecretKey-SoNotThisOne
   IRIS_SECURITY_PASSWORD_SALT: ARandomSalt-NotThisOneEither
 
-  ## @param irisapp.envFromSecret Environment variables from a secret
-  ##
-  envFromSecret:
-    name: postgres-secret
-    keys:
-      - POSTGRES_USER
-      - POSTGRES_PASSWORD
-      - POSTGRES_ADMIN_USER
-      - POSTGRES_ADMIN_PASSWORD
-      - POSTGRES_PORT
-      - POSTGRES_SERVER
+  ## @param irisworker.envFromSecrets List of secrets to load environment variables from
+  ##
+  envFromSecrets:
+    - name: postgres-secret
+    # - name: extra-secret
 
   ## @param irisworker.securityContext securityContext for irisworker
   ##