[MOSIP-35892] Updated helm charts to add range

Signed-off-by: Rakshithb1 <rakshit.b@technoforte.co.in>
mosip · Oct 15, 2024 · 74961c6 · 74961c6
1 parent e8afd79
commit 74961c6
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 12 deletions.
diff --git a/helm/idgenerator/templates/deployment.yaml b/helm/idgenerator/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/idgenerator/values.yaml b/helm/idgenerator/values.yaml
@@ -253,7 +253,7 @@ extraEnvVarsCM:
 
 ## Secret with extra environment variables
 ##
-extraEnvVarsSecret:
+extraEnvVarsSecret: []
 
 ## Extra volumes to add to the deployment
 ##

diff --git a/helm/notifier/templates/deployment.yaml b/helm/notifier/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/notifier/values.yaml b/helm/notifier/values.yaml
@@ -252,7 +252,7 @@ extraEnvVarsCM:
 
 ## Secret with extra environment variables
 ##
-extraEnvVarsSecret:
+extraEnvVarsSecret: []
 
 ## Extra volumes to add to the deployment
 ##

diff --git a/helm/pridgenerator/templates/deployment.yaml b/helm/pridgenerator/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/pridgenerator/values.yaml b/helm/pridgenerator/values.yaml
@@ -252,7 +252,7 @@ extraEnvVarsCM:
 
 ## Secret with extra environment variables
 ##
-extraEnvVarsSecret:
+extraEnvVarsSecret: []
 
 ## Extra volumes to add to the deployment
 ##

diff --git a/helm/ridgenerator/templates/deployment.yaml b/helm/ridgenerator/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/ridgenerator/values.yaml b/helm/ridgenerator/values.yaml
@@ -251,7 +251,7 @@ extraEnvVarsCM:
 
 ## Secret with extra environment variables
 ##
-extraEnvVarsSecret:
+extraEnvVarsSecret: []
 
 ## Extra volumes to add to the deployment
 ##