[MOSIP-35892] Updated helm charts to add range

Signed-off-by: Rakshithb1 <[email protected]>
mosip · Oct 15, 2024 · cd8569c · cd8569c
1 parent 0c8ec18
commit cd8569c
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 12 deletions.
diff --git a/helm/admin-hotlist/templates/deployment.yaml b/helm/admin-hotlist/templates/deployment.yaml
@@ -94,7 +94,8 @@ spec:
             - name: JDK_JAVA_OPTIONS
               value: {{ .Values.additionalResources.javaOpts }}
             {{- if .Values.extraEnvVars }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
+            {{- range .Values.extraEnvVars }}
+            {{- end }}
             {{- end }}
           envFrom:
             {{- if .Values.extraEnvVarsCM }}
@@ -104,8 +105,10 @@ spec:
             {{- end }}
             {{- end }}
             {{- if .Values.extraEnvVarsSecret }}
+            {{- range .Values.extraEnvVarsSecret }}
             - secretRef:
-                name: {{ include "common.tplvalues.render" (dict "value" .Values.extraEnvVarsSecret "context" $) }}
+                name: {{ . }}
+            {{- end }}
             {{- end }}
           ports:
             - name: spring-service

diff --git a/helm/admin-hotlist/values.yaml b/helm/admin-hotlist/values.yaml
@@ -251,7 +251,7 @@ extraEnvVarsCM:
 
 ## Secret with extra environment variables
 ##
-extraEnvVarsSecret:
+extraEnvVarsSecret: []
 
 ## Extra volumes to add to the deployment
 ##

diff --git a/helm/admin-service/templates/deployment.yaml b/helm/admin-service/templates/deployment.yaml
@@ -94,7 +94,8 @@ spec:
             - name: JDK_JAVA_OPTIONS
               value: {{ .Values.additionalResources.javaOpts }}
             {{- if .Values.extraEnvVars }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
+            {{- range .Values.extraEnvVars }}
+            {{- end }}
             {{- end }}
           envFrom:
             {{- if .Values.extraEnvVarsCM }}
@@ -104,8 +105,10 @@ spec:
             {{- end }}
             {{- end }}
             {{- if .Values.extraEnvVarsSecret }}
+            {{- range .Values.extraEnvVarsSecret }}
             - secretRef:
-                name: {{ include "common.tplvalues.render" (dict "value" .Values.extraEnvVarsSecret "context" $) }}
+                name: {{ . }}
+            {{- end }}
             {{- end }}
           ports:
             - name: spring-service

diff --git a/helm/admin-service/values.yaml b/helm/admin-service/values.yaml
@@ -251,7 +251,7 @@ extraEnvVarsCM:
 
 ## Secret with extra environment variables
 ##
-extraEnvVarsSecret:
+extraEnvVarsSecret: []
 
 ## Extra volumes to add to the deployment
 ##

diff --git a/helm/masterdata/templates/deployment.yaml b/helm/masterdata/templates/deployment.yaml
@@ -95,7 +95,8 @@ spec:
             - name: JDK_JAVA_OPTIONS
               value: {{ .Values.additionalResources.javaOpts }}
             {{- if .Values.extraEnvVars }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
+            {{- range .Values.extraEnvVars }}
+            {{- end }}
             {{- end }}
           envFrom:
             {{- if .Values.extraEnvVarsCM }}
@@ -105,8 +106,10 @@ spec:
             {{- end }}
             {{- end }}
             {{- if .Values.extraEnvVarsSecret }}
+            {{- range .Values.extraEnvVarsSecret }}
             - secretRef:
-                name: {{ include "common.tplvalues.render" (dict "value" .Values.extraEnvVarsSecret "context" $) }}
+                name: {{ . }}
+            {{- end }}
             {{- end }}
           ports:
             - name: spring-service

diff --git a/helm/masterdata/values.yaml b/helm/masterdata/values.yaml
@@ -251,7 +251,7 @@ extraEnvVarsCM:
 
 ## Secret with extra environment variables
 ##
-extraEnvVarsSecret:
+extraEnvVarsSecret: []
 
 ## Extra volumes to add to the deployment
 ##

diff --git a/helm/syncdata/templates/deployment.yaml b/helm/syncdata/templates/deployment.yaml
@@ -95,7 +95,8 @@ spec:
             - name: JDK_JAVA_OPTIONS
               value: {{ .Values.additionalResources.javaOpts }}
             {{- if .Values.extraEnvVars }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
+            {{- range .Values.extraEnvVars }}
+            {{- end }}
             {{- end }}
           envFrom:
             {{- if .Values.extraEnvVarsCM }}
@@ -105,8 +106,10 @@ spec:
             {{- end }}
             {{- end }}
             {{- if .Values.extraEnvVarsSecret }}
+            {{- range .Values.extraEnvVarsSecret }}
             - secretRef:
-                name: {{ include "common.tplvalues.render" (dict "value" .Values.extraEnvVarsSecret "context" $) }}
+                name: {{ . }}
+            {{- end }}
             {{- end }}
           ports:
             - name: spring-service

diff --git a/helm/syncdata/values.yaml b/helm/syncdata/values.yaml
@@ -251,7 +251,7 @@ extraEnvVarsCM:
 
 ## Secret with extra environment variables
 ##
-extraEnvVarsSecret:
+extraEnvVarsSecret: []
 
 ## Extra volumes to add to the deployment
 ##