jupyter-pyspark secret

InseeFrLab · Sep 20, 2023 · a595313 · a595313
1 parent 13cd064
commit a595313
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 99 deletions.
diff --git a/charts/jupyter-pyspark/Chart.yaml b/charts/jupyter-pyspark/Chart.yaml
@@ -24,9 +24,9 @@ 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.0
+version: 1.32.1
 
 dependencies:
   - name: library-chart
-    version: 1.4.4
+    version: 1.5.2
     repository: https://inseefrlab.github.io/helm-charts-interactive-services
diff --git a/charts/jupyter-pyspark/templates/_secret.tpl b/charts/jupyter-pyspark/templates/_secret.tpl
diff --git a/charts/jupyter-pyspark/templates/configmap-mlflow.yaml b/charts/jupyter-pyspark/templates/configmap-mlflow.yaml
diff --git a/charts/jupyter-pyspark/templates/secret-mlflow.yaml b/charts/jupyter-pyspark/templates/secret-mlflow.yaml
@@ -0,0 +1 @@
+{{ include "library-chart.secretMLFlow" . }}
diff --git a/charts/jupyter-pyspark/templates/secret-token.yaml b/charts/jupyter-pyspark/templates/secret-token.yaml
@@ -0,0 +1 @@
+{{ include "library-chart.secretToken" . }}
diff --git a/charts/jupyter-pyspark/templates/statefulset.yaml b/charts/jupyter-pyspark/templates/statefulset.yaml
@@ -112,8 +112,6 @@ spec:
               {{- end }}
             - name: NB_USER
               value: {{ .Values.environment.user }}
-            - name: PASSWORD
-              value: {{ .Values.security.password }}
             - name: PROJECT_USER
               value: {{ .Values.environment.user }}
             - name: PROJECT_GROUP
@@ -137,6 +135,8 @@ spec:
               value: "yes"
             {{- end }}          
           envFrom: 
+            - secretRef:
+                name: {{ include "library-chart.secretNameToken" . }}
             {{- if .Values.s3.enabled }}
             - secretRef:
                 name: {{ include "library-chart.secretNameS3" . }}
@@ -153,9 +153,9 @@ spec:
             - configMapRef:
                 name: {{ include "library-chart.configMapNameRepository" . }}
             {{- end }}
-            {{- if not (empty (trim (include "library-chart.configMapMLFlow" .)))}}
-            - configMapRef:
-                name: {{ include "library-chart.configMapNameMLFlow" . }}
+            {{- if and .Values.discovery.mlflow (not (empty (trim (include "library-chart.secretMLFlow" .)))) }}
+            - secretRef:
+                name: {{ include "library-chart.secretNameMLFlow" . }}
             {{- end }}
           livenessProbe:
             httpGet: