fix: use extraENV for db & dashboard pod

Author: nischalstha9

dashboard-charts/templates/dashboard/deployment.yaml

@@ -40,8 +40,8 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ .Release.Name }}-dashboard-common-env
-{{- if .Values.dashboard.extraEnvFrom }}
-{{ toYaml .Values.dashboard.extraEnvFrom | indent 12 }}
+{{- if .Values.extraEnvFrom }}
+{{ toYaml .Values.extraEnvFrom | indent 12 }}
 {{- end }}
       containers:
         - name: {{ .Chart.Name }}-dashboard
@@ -73,6 +73,9 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ .Release.Name }}-dashboard-common-env
+{{- if .Values.extraEnvFrom }}
+{{ toYaml .Values.extraEnvFrom | indent 12 }}
+{{- end }}
           volumeMounts:
             - name: applied-templates-storage
               mountPath: {{ .Values.dashboard.persistenceDisk.mountPath }}

dashboard-charts/templates/database/statefulset.yaml

@@ -38,8 +38,17 @@ spec:
               value: {{ .Release.Name }}-dashboard-db
             - name: POSTGRES_DB
               value: {{ .Values.db.env.POSTGRES_DB }}
+            {{- $pw := .Values.db.env.POSTGRES_PASSWORD | default "" -}}
+            {{- if ne $pw "" }}
             - name: POSTGRES_PASSWORD
-              value: {{ quote .Values.db.env.POSTGRES_PASSWORD }}
+              value: {{ $pw | quote }}
+            {{- else }}
+            - name: POSTGRES_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ (index .Values.extraEnvFrom 0).secretRef.name | quote }}
+                  key: POSTGRES_PASSWORD
+            {{- end }}
             - name: POSTGRES_USER
               value: {{ default "postgres" .Values.db.env.POSTGRES_USER | quote }}
             - name: PGUSER
@@ -85,6 +94,10 @@ spec:
               memory: {{ .Values.db.resources.limits.memory }}
               cpu: {{ .Values.db.resources.limits.cpu }}
           {{- end }}
+{{- if .Values.extraEnvFrom }}
+          envFrom:
+{{ toYaml .Values.extraEnvFrom | indent 12 }}
+{{- end }}
       volumes:
         - name: postgres-storage
         {{- if .Values.db.persistenceDisk.enabled }}