From 9c6a9fad422c7ae29f5758d1ee232e04ada42a5a Mon Sep 17 00:00:00 2001 From: Gaspard FEREY Date: Wed, 30 Oct 2024 11:34:51 +0100 Subject: [PATCH] Change of mind regarding the templating of extraenv values --- charts/jupyter-pyspark/Chart.yaml | 2 +- charts/jupyter-pyspark/templates/statefulset.yaml | 5 +++-- charts/jupyter-python/Chart.yaml | 2 +- charts/jupyter-python/templates/statefulset.yaml | 5 +++-- charts/rstudio-sparkr/Chart.yaml | 2 +- charts/rstudio-sparkr/templates/statefulset.yaml | 5 +++-- charts/rstudio/Chart.yaml | 2 +- charts/rstudio/templates/statefulset.yaml | 5 +++-- charts/vscode-pyspark/Chart.yaml | 2 +- charts/vscode-pyspark/templates/statefulset.yaml | 5 +++-- charts/vscode-python/Chart.yaml | 2 +- charts/vscode-python/templates/statefulset.yaml | 5 +++-- 12 files changed, 24 insertions(+), 18 deletions(-) diff --git a/charts/jupyter-pyspark/Chart.yaml b/charts/jupyter-pyspark/Chart.yaml index 6c6548b3..22b990a2 100644 --- 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 index 2f65e94a..d77a5428 100644 --- 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 index 12e6d799..65d7c4c1 100644 --- 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 index 08344d78..f50bf408 100644 --- 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 index 1a40676d..1ef5147b 100644 --- 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 index 61840561..b71cd2c7 100644 --- 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 index 2aa12de8..a6b5489d 100644 --- 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 index 678a7be4..9642fc78 100644 --- 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 index e5d83571..39c5318d 100644 --- 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 index b1ba9fd7..cbc5d46b 100644 --- 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 index 10f02167..51601cb8 100644 --- 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 index fc6b6215..e6017523 100644 --- 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: