Merge pull request #870 from InseeFrLab/chart-v10

Chart v10
InseeFrLab · Nov 6, 2024 · 4842671 · 4842671
2 parents 177ffed + 675379a
commit 4842671
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 11 deletions.
diff --git a/api b/api
diff --git a/helm-chart/templates/configmap.yaml b/helm-chart/templates/configmap.yaml
@@ -21,5 +21,6 @@ data:
   catalogs: {{ .Values.api.catalogs | toJson | quote }}
 {{- end}}
 {{- if .Values.api.schemas.enabled }}
-  external.schema.directory: {{ .Values.api.schemas.rootPath | quote }}
+  external.schema.directory: {{ printf "%s%s/" .Values.api.schemas.rootPath .Values.api.schemas.subPathDefault | quote }}
+  role.schema.directory: {{ printf "%s%s/" .Values.api.schemas.rootPath .Values.api.schemas.subPathRole | quote }}
 {{- end}}
diff --git a/helm-chart/templates/configmaps-schemas.yaml b/helm-chart/templates/configmaps-schemas.yaml
@@ -4,10 +4,23 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ $fullname }}-{{ .relativePath | sha256sum | trunc 8 }}
+  name: {{ $fullname }}-{{ printf "%s %s" .relativePath "default" | sha256sum | trunc 8 }}
 data:
   {{ .relativePath | base }}: |-
 {{ .content | indent 4 }}
 ---
 {{- end }}
+{{- range .Values.api.schemas.roles }}
+{{- $role := .roleName -}}
+{{- range .files }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ $fullname }}-{{ printf "%s %s %s" .relativePath "role" $role | sha256sum | trunc 8 }}
+data:
+  {{ .relativePath | base }}: |-
+{{ .content | indent 4 }}
+---
+{{- end }}
+{{- end }}
 {{- end }}
diff --git a/helm-chart/templates/deployment-api.yaml b/helm-chart/templates/deployment-api.yaml
@@ -79,12 +79,22 @@ spec:
           volumeMounts:
             {{- if .Values.api.schemas.enabled }}
             {{- $path := .Values.api.schemas.rootPath -}}
+            {{- $subpath := .Values.api.schemas.subPathDefault -}}
             {{- $fullname := include "onyxia.fullname" . -}}
             {{- range .Values.api.schemas.files }}
-            - name: {{ $fullname }}-{{ .relativePath | sha256sum | trunc 8 }}
-              mountPath: {{ $path }}{{ .relativePath }}
+            - name: {{ $fullname }}-{{ printf "%s %s" .relativePath "default" | sha256sum | trunc 8 }}
+              mountPath: {{ printf "%s%s/%s" $path $subpath .relativePath }}
               subPath: {{ .relativePath | base }}
             {{- end }}
+            {{- $subpath := .Values.api.schemas.subPathRole -}}
+            {{- range .Values.api.schemas.roles }}
+            {{- $role := .roleName -}}
+            {{- range .files }}           
+            - name: {{ $fullname }}-{{ printf "%s %s %s" .relativePath "role" $role | sha256sum | trunc 8 }}
+              mountPath: {{ printf "%s%s/%s/%s" $path $subpath $role .relativePath }}
+              subPath: {{ .relativePath | base }}    
+            {{- end }}
+            {{- end }}
             {{- end }}
             {{- if .Values.api.extraVolumeMounts }}
             {{- toYaml .Values.api.extraVolumeMounts | nindent 12 }}
@@ -107,9 +117,17 @@ spec:
         {{- if .Values.api.schemas.enabled }}
         {{- $fullname := include "onyxia.fullname" . -}}
         {{- range .Values.api.schemas.files }}
-        - name: {{ $fullname }}-{{ .relativePath | sha256sum | trunc 8 }}
+        - name: {{ $fullname }}-{{ printf "%s %s" .relativePath "default" | sha256sum | trunc 8 }}
           configMap:
-            name: {{ $fullname }}-{{ .relativePath | sha256sum | trunc 8 }}
+            name: {{ $fullname }}-{{ printf "%s %s" .relativePath "default" | sha256sum | trunc 8 }}
+        {{- end }}
+        {{- range .Values.api.schemas.roles }}
+        {{- $role := .roleName -}}
+        {{- range .files }}
+        - name: {{ $fullname }}-{{ printf "%s %s %s" .relativePath "role" $role | sha256sum | trunc 8 }}
+          configMap:
+            name: {{ $fullname }}-{{ printf "%s %s %s" .relativePath "role" $role | sha256sum | trunc 8 }}        
+        {{- end }}
         {{- end }}
         {{- end }}
         {{- if .Values.api.extraVolumes }}

diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml
@@ -166,10 +166,13 @@ api:
   schemas:
     enabled: false
     rootPath: /schemas/
-    files:
-      []
-      # - relativePath: nodeSelector.json
-      #   content: |
+    subPathDefault: default
+    subPathRole: role
+    roles:
+      #  - roleName: datascientist
+      #    files:
+      #      - relativePath: nodeSelector.json
+      #        content: |
       #  {
       #    "$schema": "http://json-schema.org/draft-07/schema#",
       #    "title": "Node Selector",
@@ -188,6 +191,23 @@ api:
       #    },
       #    "additionalProperties": false
       #  }
+    files:
+      []
+      # - relativePath: nodeSelector.json
+      #   content: |
+      #  {
+      #    "$schema": "http://json-schema.org/draft-07/schema#",
+      #    "title": "Node Selector",
+      #    "type": "object",
+      #    "properties": {
+      #      "disktype": {
+      #        "description": "The type of disk",
+      #        "type": "string",
+      #        "enum": ["ssd", "hdd"]
+      #      }
+      #    },
+      #    "additionalProperties": false
+      #  }
   livenessProbe:
     enabled: true
     path: /public/healthcheck
+4 −2		README.md
+24 −23		docs/region-configuration.md
+5 −0		onyxia-api/pom.xml
+5 −1		onyxia-api/src/main/java/fr/insee/onyxia/api/configuration/CustomObjectMapper.java
+92 −2		onyxia-api/src/main/java/fr/insee/onyxia/api/controller/api/mylab/MyLabController.java
+4 −91		onyxia-api/src/main/java/fr/insee/onyxia/api/controller/api/mylab/QuotaController.java
+1 −105		onyxia-api/src/main/java/fr/insee/onyxia/api/controller/pub/CatalogController.java
+8 −4		onyxia-api/src/main/java/fr/insee/onyxia/api/controller/pub/JsonSchemaController.java
+2 −9		onyxia-api/src/main/java/fr/insee/onyxia/api/dao/universe/CatalogLoader.java
+110 −11		onyxia-api/src/main/java/fr/insee/onyxia/api/security/OIDCConfiguration.java
+82 −4		onyxia-api/src/main/java/fr/insee/onyxia/api/services/JsonSchemaRegistryService.java
+21 −11		onyxia-api/src/main/java/fr/insee/onyxia/api/services/JsonSchemaResolutionService.java
+1 −14		onyxia-api/src/main/java/fr/insee/onyxia/api/services/impl/HelmAppsService.java
+10 −24		onyxia-api/src/main/java/fr/insee/onyxia/api/services/impl/kubernetes/KubernetesService.java
+3 −0		onyxia-api/src/main/resources/application.properties
+0 −1		onyxia-api/src/main/resources/regions.json
+20 −0		onyxia-api/src/main/resources/schemas/ide/extraenv.json
+1 −0		onyxia-api/src/main/resources/schemas/nodeSelector-gpu.json
+1 −0		onyxia-api/src/main/resources/schemas/nodeSelector.json
+1 −0		onyxia-api/src/main/resources/schemas/tolerations.json
+11 −0		onyxia-model/src/main/java/fr/insee/onyxia/model/User.java
+21 −0		onyxia-model/src/main/java/fr/insee/onyxia/model/catalog/CatalogWrapper.java
+2 −0		onyxia-model/src/main/java/fr/insee/onyxia/model/catalog/Pkg.java
+7 −26		onyxia-model/src/main/java/fr/insee/onyxia/model/region/Region.java
+12 −0		onyxia-model/src/main/java/fr/insee/onyxia/model/views/Views.java