Change of mind regarding the templating of extraenv values

InseeFrLab · Oct 30, 2024 · 9c6a9fa · 9c6a9fa
1 parent 59e1321
commit 9c6a9fa
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 18 deletions.
diff --git a/charts/jupyter-pyspark/Chart.yaml b/charts/jupyter-pyspark/Chart.yaml
@@ -24,7 +24,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.1.9
+version: 2.1.10
 
 dependencies:
   - name: library-chart

diff --git a/charts/jupyter-pyspark/templates/statefulset.yaml b/charts/jupyter-pyspark/templates/statefulset.yaml
@@ -240,8 +240,9 @@ spec:
             - name: DARK_MODE
               value: "true"
             {{- end }}
-            {{- with .Values.extraEnvVars }}
-            {{- tpl (toYaml .) $.Values | nindent 12 }}
+            {{- range .Values.extraEnvVars }}
+            - name: {{ .name }}
+              value: {{ tpl .value $.Values }}
             {{- end }}
           envFrom:
             - secretRef:

diff --git a/charts/jupyter-python/Chart.yaml b/charts/jupyter-python/Chart.yaml
@@ -22,7 +22,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.1.8
+version: 2.1.9
 
 dependencies:
   - name: library-chart

diff --git a/charts/jupyter-python/templates/statefulset.yaml b/charts/jupyter-python/templates/statefulset.yaml
@@ -191,8 +191,9 @@ spec:
             - name: DARK_MODE
               value: "true"
             {{- end }}
-            {{- with .Values.extraEnvVars }}
-            {{- tpl (toYaml .) $.Values | nindent 12 }}
+            {{- range .Values.extraEnvVars }}
+            - name: {{ .name }}
+              value: {{ tpl .value $.Values }}
             {{- end }}
           envFrom:
             - secretRef:

diff --git a/charts/rstudio-sparkr/Chart.yaml b/charts/rstudio-sparkr/Chart.yaml
@@ -23,7 +23,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.1.7
+version: 2.1.8
 dependencies:
   - name: library-chart
     version: 1.5.28

diff --git a/charts/rstudio-sparkr/templates/statefulset.yaml b/charts/rstudio-sparkr/templates/statefulset.yaml
@@ -215,8 +215,9 @@ spec:
             - name: DARK_MODE
               value: "true"
             {{- end }}
-            {{- with .Values.extraEnvVars }}
-            {{- tpl (toYaml .) $.Values | nindent 12 }}
+            {{- range .Values.extraEnvVars }}
+            - name: {{ .name }}
+              value: {{ tpl .value $.Values }}
             {{- end }}
           envFrom:
             - secretRef:

diff --git a/charts/rstudio/Chart.yaml b/charts/rstudio/Chart.yaml
@@ -22,7 +22,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.1.5
+version: 2.1.6
 dependencies:
   - name: library-chart
     version: 1.5.28

diff --git a/charts/rstudio/templates/statefulset.yaml b/charts/rstudio/templates/statefulset.yaml
@@ -150,8 +150,9 @@ spec:
             - name: DARK_MODE
               value: "true"
             {{- end }}
-            {{- with .Values.extraEnvVars }}
-            {{- tpl (toYaml .) $.Values | nindent 12 }}
+            {{- range .Values.extraEnvVars }}
+            - name: {{ .name }}
+              value: {{ tpl .value $.Values }}
             {{- end }}
           envFrom:
             {{- if .Values.s3.enabled }}

diff --git a/charts/vscode-pyspark/Chart.yaml b/charts/vscode-pyspark/Chart.yaml
@@ -24,7 +24,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.1.10
+version: 2.1.11
 
 dependencies:
   - name: library-chart

diff --git a/charts/vscode-pyspark/templates/statefulset.yaml b/charts/vscode-pyspark/templates/statefulset.yaml
@@ -237,8 +237,9 @@ spec:
             - name: DARK_MODE
               value: "true"
             {{- end }}
-            {{- with .Values.extraEnvVars }}
-            {{- tpl (toYaml .) $.Values | nindent 12 }}
+            {{- range .Values.extraEnvVars }}
+            - name: {{ .name }}
+              value: {{ tpl .value $.Values }}
             {{- end }}
           envFrom:
             - secretRef:

diff --git a/charts/vscode-python/Chart.yaml b/charts/vscode-python/Chart.yaml
@@ -22,7 +22,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.1.9
+version: 2.1.10
 
 dependencies:
   - name: library-chart

diff --git a/charts/vscode-python/templates/statefulset.yaml b/charts/vscode-python/templates/statefulset.yaml
@@ -177,8 +177,9 @@ spec:
             - name: DARK_MODE
               value: "true"
             {{- end }}
-            {{- with .Values.extraEnvVars }}
-            {{- tpl (toYaml .) $.Values | nindent 12 }}
+            {{- range .Values.extraEnvVars }}
+            - name: {{ .name }}
+              value: {{ tpl .value $.Values }}
             {{- end }}
           envFrom:
             - secretRef: