ubuntu

InseeFrLab · Sep 18, 2024 · 53fe58d · 53fe58d
1 parent 34bf8db
commit 53fe58d
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 deletions.
diff --git a/charts/ubuntu/Chart.yaml b/charts/ubuntu/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: 5.4.4
+version: 5.4.5
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -31,5 +31,5 @@ appVersion: latest
 
 dependencies:
   - name: library-chart
-    version: 2.1.0
-    repository: https://inseefrlab.github.io/helm-charts-datascience
+    version: 1.5.25
+    repository: https://inseefrlab.github.io/helm-charts-interactive-services
diff --git a/charts/ubuntu/templates/configmap-git.yaml b/charts/ubuntu/templates/configmap-git.yaml
diff --git a/charts/ubuntu/templates/configmap-s3.yaml b/charts/ubuntu/templates/configmap-s3.yaml
diff --git a/charts/ubuntu/templates/configmap-vault.yaml b/charts/ubuntu/templates/configmap-vault.yaml
diff --git a/charts/ubuntu/templates/deployment.yaml b/charts/ubuntu/templates/deployment.yaml
@@ -68,16 +68,16 @@ spec:
             {{- end }}   
           envFrom: 
             {{- 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 }}
           ports:
             - name: http

diff --git a/charts/ubuntu/templates/secret-git.yaml b/charts/ubuntu/templates/secret-git.yaml
@@ -0,0 +1 @@
+{{ include "library-chart.secretGit" . }}
diff --git a/charts/ubuntu/templates/secret-s3.yaml b/charts/ubuntu/templates/secret-s3.yaml
@@ -0,0 +1 @@
+{{ include "library-chart.secretS3" . }}
diff --git a/charts/ubuntu/templates/secret-vault.yaml b/charts/ubuntu/templates/secret-vault.yaml
@@ -0,0 +1 @@
+{{ include "library-chart.secretVault" . }}
diff --git a/charts/ubuntu/values.schema.json b/charts/ubuntu/values.schema.json
@@ -153,20 +153,17 @@
             }
         },
         "security": {
-            "description": "RStudio specific configuration",
+            "description": "security specific configuration",
             "type": "object",
             "properties": {
                 "password": {
                     "type": "string",
                     "description": "Password",
                     "default": "changeme",
-                    "x-form": {
-                        "value": "{{project.password}}"
-                    },
                     "x-onyxia": {
-                        "overwriteDefaultWith": "{{project.password}}"
-                    }
-                },
+                        "overwriteDefaultWith": "{{service.oneTimePassword}}",
+                        "overwriteSchemaWith": "ide/password"
+                    }                },
                 "allowlist": {
                     "type": "object",
                     "description": "IP protection",
@@ -204,6 +201,9 @@
                   "networkPolicy": {
                     "type": "object",
                     "description": "Define access policy to the service",
+                    "x-onyxia": {
+                        "overwriteSchemaWith": "network-policy.json"
+                    },
                     "properties": {
                       "enabled": {
                         "type": "boolean",