Merge pull request #112 from InseeFrLab/set-metaflowconfig-to-user-ac…

…cess set-metaflowconfig-to-user-access
InseeFrLab · Nov 28, 2023 · 02395a9 · 02395a9
2 parents 484f507 + cd3c97e
commit 02395a9
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 16 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: 1.32.25
+version: 1.32.26
 
 dependencies:
   - name: library-chart

diff --git a/charts/jupyter-pyspark/templates/statefulset.yaml b/charts/jupyter-pyspark/templates/statefulset.yaml
@@ -103,7 +103,27 @@ 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 }}
+              {{- if .Values.discovery.metaflow }}
+              mkdir /dest/metaflow;
+              cp /src/metaflow/config.json /dest/metaflow/config.json;
+              {{- end }}
           volumeMounts:
             {{- if .Values.s3.enabled }}
             - name: secret-coresite
@@ -248,8 +268,8 @@ spec:
             {{- end }}
             {{- if .Values.discovery.metaflow }}
             - name: config-files
-              mountPath: /home/{{ .Values.environment.user}}/.metaflowconfig/config.json
-              subPath: metaflow/config.json
+              mountPath: /home/{{ .Values.environment.user}}/.metaflowconfig
+              subPath: metaflow
             {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:

diff --git a/charts/jupyter-python/Chart.yaml b/charts/jupyter-python/Chart.yaml
@@ -23,7 +23,7 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: 1.13.20
+version: 1.13.21
 
 dependencies:
   - name: library-chart

diff --git a/charts/jupyter-python/templates/statefulset.yaml b/charts/jupyter-python/templates/statefulset.yaml
@@ -78,7 +78,15 @@ spec:
           command: 
             - sh
             - -c 
-            - cp -R /src/* /dest
+            - |
+              {{- if .Values.discovery.hive }}
+              mkdir /dest/hive;
+              cp /src/hive/hive-site.xml /dest/hive/hive-site.xml;
+              {{- end }}
+              {{- if .Values.discovery.metaflow }}
+              mkdir /dest/metaflow/;
+              cp /src/metaflow/config.json /dest/metaflow/config.json;
+              {{- end }}
           volumeMounts:
             - name: config-files
               mountPath: /dest
@@ -196,8 +204,8 @@ spec:
             {{- end }}   
             {{- if .Values.discovery.metaflow }}
             - name: config-files
-              mountPath: /home/{{ .Values.environment.user}}/.metaflowconfig/config.json
-              subPath: metaflow/config.json
+              mountPath: /home/{{ .Values.environment.user}}/.metaflowconfig
+              subPath: metaflow
             {{- end }}     
       {{- with .Values.nodeSelector }}
       nodeSelector:

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: 1.3.18
+version: 1.3.19
 
 dependencies:
   - name: library-chart

diff --git a/charts/vscode-pyspark/templates/statefulset.yaml b/charts/vscode-pyspark/templates/statefulset.yaml
@@ -100,7 +100,27 @@ 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 }}
+              mdir /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 }}       
+              {{- if .Values.discovery.metaflow }}
+              mkdir /dest/metaflow;
+              cp /src/metaflow/config.json /dest/metaflow/config.json;
+              {{- end }}  
           volumeMounts:
             - name: config-files
               mountPath: /dest
@@ -245,8 +265,8 @@ spec:
             {{- end }}       
             {{- if .Values.discovery.metaflow }}
             - name: config-files
-              mountPath: /home/{{ .Values.environment.user}}/.metaflowconfig/config.json
-              subPath: metaflow/config.json
+              mountPath: /home/{{ .Values.environment.user}}/.metaflowconfig
+              subPath: metaflow
             {{- end }}   
       {{- with .Values.nodeSelector }}
       nodeSelector:

diff --git a/charts/vscode-python/Chart.yaml b/charts/vscode-python/Chart.yaml
@@ -23,7 +23,7 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: 1.11.18
+version: 1.11.19
 
 dependencies:
   - name: library-chart

diff --git a/charts/vscode-python/templates/statefulset.yaml b/charts/vscode-python/templates/statefulset.yaml
@@ -80,7 +80,15 @@ spec:
           command: 
             - sh
             - -c 
-            - cp -R /src/* /dest
+            - |
+              {{- if .Values.discovery.hive }}
+              mkdir /dest/hive;
+              cp /src/hive/hive-site.xml /dest/hive/hive-site.xml;
+              {{- end }}   
+              {{- if .Values.discovery.metaflow }}
+              mkdir /dest/metaflow;
+              cp /src/metaflow/config.json /dest/metaflow/config.json;
+              {{- end }}
           volumeMounts:
             - name: config-files
               mountPath: /dest
@@ -181,8 +189,8 @@ spec:
             {{- end }}   
             {{- if .Values.discovery.metaflow }}
             - name: config-files
-              mountPath: /home/{{ .Values.environment.user}}/.metaflowconfig/config.json
-              subPath: metaflow/config.json
+              mountPath: /home/{{ .Values.environment.user}}/.metaflowconfig
+              subPath: metaflow
             {{- end }}
             - mountPath: /dev/shm
               name: dshm