Merge pull request #396 from Rakshithb1/develop

[MOSIP-35892] Updated helm charts to add range
mosip · Oct 28, 2024 · 5fa83be · 5fa83be
2 parents 317b964 + 8735a0c
commit 5fa83be
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/helm/signup-service/templates/deployment.yaml b/helm/signup-service/templates/deployment.yaml
@@ -107,15 +107,17 @@ spec:
             {{- end }}
           envFrom:
             {{- if .Values.extraEnvVarsCM }}
-              {{- range .Values.extraEnvVarsCM }}
-              - configMapRef:
-                  name: {{ . }}
-              {{- end }}
-              {{- end }}
-              {{- if .Values.extraEnvVarsSecret }}
-              - secretRef:
-                  name: {{ include "common.tplvalues.render" (dict "value" .Values.extraEnvVarsSecret "context" $) }}
-              {{- end }}
+            {{- range .Values.extraEnvVarsCM }}
+            - configMapRef:
+                name: {{ . }}
+            {{- end }}
+            {{- end }}
+            {{- if .Values.extraEnvVarsSecret }}
+            {{- range .Values.extraEnvVarsSecret }}
+            - secretRef:
+                name: {{ . }}
+            {{- end }}
+            {{- end }}
           ports:
             - name: spring-service
               containerPort: {{ .Values.springServicePort }}

diff --git a/helm/signup-ui/templates/deployment.yaml b/helm/signup-ui/templates/deployment.yaml
@@ -116,8 +116,10 @@ spec:
             {{- end }}
             {{- end }}
             {{- if .Values.extraEnvVarsSecret }}
+            {{- range .Values.extraEnvVarsSecret }}
             - secretRef:
-                name: {{ include "common.tplvalues.render" (dict "value" .Values.extraEnvVarsSecret "context" $) }}
+                name: {{ . }}
+            {{- end }}
             {{- end }}
           volumeMounts:
             - name: nginx-config