Merge pull request #96 from InseeFrLab/47-put-secret-into-kubernetes-…

…secret 47 put secret into kubernetes secret
InseeFrLab · Sep 21, 2023 · d55ed43 · d55ed43
2 parents a3148bd + a595313
commit d55ed43
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 18 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.3
+    version: 1.5.2
     repository: https://inseefrlab.github.io/helm-charts-interactive-services
diff --git a/charts/jupyter-pyspark/templates/configmap-git.yaml b/charts/jupyter-pyspark/templates/configmap-git.yaml
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/configmap-s3.yaml b/charts/jupyter-pyspark/templates/configmap-s3.yaml
diff --git a/charts/jupyter-pyspark/templates/configmap-vault.yaml b/charts/jupyter-pyspark/templates/configmap-vault.yaml
diff --git a/charts/jupyter-pyspark/templates/secret-git.yaml b/charts/jupyter-pyspark/templates/secret-git.yaml
@@ -0,0 +1 @@
+{{ include "library-chart.secretGit" . }}
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-s3.yaml b/charts/jupyter-pyspark/templates/secret-s3.yaml
@@ -0,0 +1 @@
+{{ include "library-chart.secretS3" . }}
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/secret-vault.yaml b/charts/jupyter-pyspark/templates/secret-vault.yaml
@@ -0,0 +1 @@
+{{ include "library-chart.secretVault" . }}
diff --git a/charts/jupyter-pyspark/templates/statefulset.yaml b/charts/jupyter-pyspark/templates/statefulset.yaml
@@ -20,7 +20,7 @@ spec:
         checksum/repository: {{ include (print $.Template.BasePath "/configmap-repository.yaml") . | sha256sum }}
         {{- end }}
         {{- if .Values.s3.enabled }}
-        checksum/s3: {{ include (print $.Template.BasePath "/configmap-s3.yaml") . | sha256sum }}
+        checksum/s3: {{ include (print $.Template.BasePath "/secret-s3.yaml") . | sha256sum }}
         {{- end }}
         {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
@@ -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,25 +135,27 @@ spec:
               value: "yes"
             {{- end }}          
           envFrom: 
+            - secretRef:
+                name: {{ include "library-chart.secretNameToken" . }}
             {{- if .Values.s3.enabled }}
-            - configMapRef:
-                name: {{ include "library-chart.configMapNameS3" . }}
+            - secretRef:
+                name: {{ include "library-chart.secretNameS3" . }}
             {{- end }}
             {{- if .Values.vault.enabled }}
-            - configMapRef:
-                name: {{ include "library-chart.configMapNameVault" . }}
+            - secretRef:
+                name: {{ include "library-chart.secretNameVault" . }}
             {{- end }}
             {{- if .Values.git.enabled }}
-            - configMapRef:
-                name: {{ include "library-chart.configMapNameGit" . }}
+            - secretRef:
+                name: {{ include "library-chart.secretNameGit" . }}
             {{- end }}
             {{- if (include "library-chart.repository.enabled"  .) }}
             - 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: