From 6838899b2c18541e1dacfa9c146f869eb9c408a5 Mon Sep 17 00:00:00 2001 From: ihiverlet Date: Wed, 29 Nov 2023 16:11:48 +0000 Subject: [PATCH 1/4] copy-files-only-to-stay-consistent --- .../rstudio-sparkr/templates/statefulset.yaml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/charts/rstudio-sparkr/templates/statefulset.yaml b/charts/rstudio-sparkr/templates/statefulset.yaml index c709c909..b0e30090 100644 --- a/charts/rstudio-sparkr/templates/statefulset.yaml +++ b/charts/rstudio-sparkr/templates/statefulset.yaml @@ -88,7 +88,23 @@ spec: command: - sh - -c - - cp -R /src/* /dest + - | + {{- if .Values.s3.enabled }} + mkdir /dest/coresite; + cp /src/coresite/core-site.xml /dest/coresite/core-site.xml; + {{- end }} + {{- if .Values.spark.default }} + mkdir /dest/spark; + cp /src/spark/spark-defaults.conf /dest/spark/spark-defaults.conf; + {{- end }} + {{- if and (.Values.spark.default) (.Values.repository.mavenRepository) }} + mkdir /dest/ivysettings; + cp /src/ivysettings/ivysettings.xml /dest/ivysettings/ivysettings.xml; + {{- end }} + {{- if .Values.discovery.hive }} + mkdir /dest/hive; + cp /src/hive/hive-site.xml /dest/hive/hive-site.xml; + {{- end }} volumeMounts: {{- if .Values.s3.enabled }} - name: secret-coresite From 0e9bc20f178211047f0fc5df48e87b11cefb3c1f Mon Sep 17 00:00:00 2001 From: ihiverlet <94982379+ihiverlet@users.noreply.github.com> Date: Thu, 30 Nov 2023 13:28:01 +0100 Subject: [PATCH 2/4] bump version --- charts/rstudio-sparkr/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/rstudio-sparkr/Chart.yaml b/charts/rstudio-sparkr/Chart.yaml index 8062c76c..8002cf10 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: 1.17.0 +version: 1.17.1 dependencies: - name: library-chart From 16913ccace56abc282f12e9d508e828f6c6316e0 Mon Sep 17 00:00:00 2001 From: ihiverlet Date: Wed, 6 Dec 2023 15:28:44 +0000 Subject: [PATCH 3/4] init container should always have a command --- charts/rstudio-sparkr/templates/statefulset.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/rstudio-sparkr/templates/statefulset.yaml b/charts/rstudio-sparkr/templates/statefulset.yaml index b0e30090..6b387131 100644 --- a/charts/rstudio-sparkr/templates/statefulset.yaml +++ b/charts/rstudio-sparkr/templates/statefulset.yaml @@ -89,6 +89,7 @@ spec: - sh - -c - | + echo 'initContainer make-secrets-writable is started'; {{- if .Values.s3.enabled }} mkdir /dest/coresite; cp /src/coresite/core-site.xml /dest/coresite/core-site.xml; From 9fbc18faef1c58669e5849221f97b6d5f52d0f1a Mon Sep 17 00:00:00 2001 From: ihiverlet Date: Wed, 6 Dec 2023 15:32:05 +0000 Subject: [PATCH 4/4] bump version --- charts/rstudio-sparkr/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/rstudio-sparkr/Chart.yaml b/charts/rstudio-sparkr/Chart.yaml index 8002cf10..c00a0afd 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: 1.17.1 +version: 1.17.2 dependencies: - name: library-chart