From 74961c6e8dbc096061e43b0358f315c4c5813f11 Mon Sep 17 00:00:00 2001 From: Rakshithb1 Date: Tue, 15 Oct 2024 13:00:28 +0530 Subject: [PATCH 1/2] [MOSIP-35892] Updated helm charts to add range Signed-off-by: Rakshithb1 --- helm/idgenerator/templates/deployment.yaml | 7 +++++-- helm/idgenerator/values.yaml | 2 +- helm/notifier/templates/deployment.yaml | 7 +++++-- helm/notifier/values.yaml | 2 +- helm/pridgenerator/templates/deployment.yaml | 7 +++++-- helm/pridgenerator/values.yaml | 2 +- helm/ridgenerator/templates/deployment.yaml | 7 +++++-- helm/ridgenerator/values.yaml | 2 +- 8 files changed, 24 insertions(+), 12 deletions(-) diff --git a/helm/idgenerator/templates/deployment.yaml b/helm/idgenerator/templates/deployment.yaml index fae49142bdb..067d30971a1 100644 --- 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 index 4d2acfd6e3c..876a881331a 100644 --- 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 index 826587135c8..ea5c059f710 100644 --- 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 index 47f84d928db..cacf5d41b87 100644 --- 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 index 29929e31fce..4d23478b1ca 100644 --- 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 index 41e78974b2c..a64fe2fa028 100644 --- 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 index 7d29298dcc8..2c50b913125 100644 --- 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 index 85b5f52aa29..8e1cfaab0d8 100644 --- 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 ## From 895e0d706af303ed32d3468b65cfa7c455327bf9 Mon Sep 17 00:00:00 2001 From: Rakshithb1 Date: Tue, 15 Oct 2024 14:54:40 +0530 Subject: [PATCH 2/2] [MOSIP-35892] Updated helm charts to add range Signed-off-by: Rakshithb1 --- helm/idgenerator/templates/deployment.yaml | 3 +-- helm/notifier/templates/deployment.yaml | 3 +-- helm/pridgenerator/templates/deployment.yaml | 3 +-- helm/ridgenerator/templates/deployment.yaml | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/helm/idgenerator/templates/deployment.yaml b/helm/idgenerator/templates/deployment.yaml index 067d30971a1..d401ebf58e7 100644 --- a/helm/idgenerator/templates/deployment.yaml +++ b/helm/idgenerator/templates/deployment.yaml @@ -95,8 +95,7 @@ spec: - name: JDK_JAVA_OPTIONS value: {{ .Values.additionalResources.javaOpts }} {{- if .Values.extraEnvVars }} - {{- range .Values.extraEnvVars }} - {{- end }} + {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }} {{- end }} envFrom: {{- if .Values.extraEnvVarsCM }} diff --git a/helm/notifier/templates/deployment.yaml b/helm/notifier/templates/deployment.yaml index ea5c059f710..269fa8dbaba 100644 --- a/helm/notifier/templates/deployment.yaml +++ b/helm/notifier/templates/deployment.yaml @@ -95,8 +95,7 @@ spec: - name: JDK_JAVA_OPTIONS value: {{ .Values.additionalResources.javaOpts }} {{- if .Values.extraEnvVars }} - {{- range .Values.extraEnvVars }} - {{- end }} + {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }} {{- end }} envFrom: {{- if .Values.extraEnvVarsCM }} diff --git a/helm/pridgenerator/templates/deployment.yaml b/helm/pridgenerator/templates/deployment.yaml index 4d23478b1ca..247cb3a05c3 100644 --- a/helm/pridgenerator/templates/deployment.yaml +++ b/helm/pridgenerator/templates/deployment.yaml @@ -95,8 +95,7 @@ spec: - name: JDK_JAVA_OPTIONS value: {{ .Values.additionalResources.javaOpts }} {{- if .Values.extraEnvVars }} - {{- range .Values.extraEnvVars }} - {{- end }} + {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }} {{- end }} envFrom: {{- if .Values.extraEnvVarsCM }} diff --git a/helm/ridgenerator/templates/deployment.yaml b/helm/ridgenerator/templates/deployment.yaml index 2c50b913125..ee7a9667014 100644 --- a/helm/ridgenerator/templates/deployment.yaml +++ b/helm/ridgenerator/templates/deployment.yaml @@ -95,8 +95,7 @@ spec: - name: JDK_JAVA_OPTIONS value: {{ .Values.additionalResources.javaOpts }} {{- if .Values.extraEnvVars }} - {{- range .Values.extraEnvVars }} - {{- end }} + {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }} {{- end }} envFrom: {{- if .Values.extraEnvVarsCM }}