Merge pull request #141 from Calcagiara/krmCoreFixes

Fixed KRM roles function and added tag for DHCORE_WORKFLOW_IMAGE. Upgraded core's runtime versions
scc-digitalhub · Dec 3, 2024 · 35d8a0b · 35d8a0b
2 parents db73e81 + 1c35d66
commit 35d8a0b
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 9 deletions.
diff --git a/charts/core/Chart.yaml b/charts/core/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: core
 description: Core backend application for DigitalHub.
 type: application
-version: 0.2.17
+version: 0.2.20
 appVersion: "0.8.0"
 maintainers:
   - name: ffais

diff --git a/charts/core/templates/configmap-digitalhub.yaml b/charts/core/templates/configmap-digitalhub.yaml
@@ -14,7 +14,7 @@ data:
   POSTGRES_SCHEMA: {{ .Values.postgres.schema }}
   S3_BUCKET_NAME: {{ .Values.minio.bucket }}
   KFP_ENDPOINT: {{ .Values.kfp.endpoint }}
-  DHCORE_WORKFLOW_IMAGE: {{ .Values.runtime.kfp.image }}
+  DHCORE_WORKFLOW_IMAGE: {{ .Values.runtime.kfp.image }}:{{ .Values.runtime.kfp.tag }}
   KFP_ENDPOINT: http://ml-pipeline:8888
   DHCORE_ENDPOINT: "{{ include "core.endpoint" . }}"
   DHCORE_ISSUER: "{{ include "core.endpoint" . }}"
diff --git a/charts/core/templates/configmap.yaml b/charts/core/templates/configmap.yaml
@@ -67,6 +67,8 @@ data:
   JWT_KEYSTORE_PATH: "{{ .Values.keystore.keystorePath }}/keystore.jwks"
   JWT_KEYSTORE_KID: {{ .Values.keystore.keystoreKid | quote }}
 {{- end }}
+  JWT_ACCESS_TOKEN_DURATION: {{ .Values.coreTokens.accessTokenDuration | quote }}
+  JWT_REFRESH_TOKEN_DURATION: {{ .Values.coreTokens.refreshTokenDuration | quote }}
   AWS_DEFAULT_REGION: {{ .Values.minio.awsDefaultRegion }}
   AWS_REGION: {{ .Values.minio.awsRegion }}
   S3_ENDPOINT: {{ .Values.minio.publicUrl }}
@@ -85,3 +87,6 @@ data:
   K8S_RESOURCE_GPU_KEY: {{ .Values.additionalConfig.resources.gpuKey | quote }}
   K8S_SERVICE_TYPE: {{ .Values.additionalConfig.service.type | quote }}
   K8S_JOB_DEADLINE: {{ .Values.additionalConfig.job.deadline | quote }}
+{{- with .Values.configmapAdditionalEnv }}
+{{- toYaml . | nindent 2 }}
+{{- end }}
diff --git a/charts/core/templates/deployment.yaml b/charts/core/templates/deployment.yaml
@@ -15,6 +15,7 @@ spec:
     metadata:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+        checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
       {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}

diff --git a/charts/core/values.yaml b/charts/core/values.yaml
@@ -154,15 +154,15 @@ kfp:
 runtime:
   dbt:
     image: "ghcr.io/scc-digitalhub/digitalhub-sdk/wrapper-dbt"
-    tag: "0.8.0"
+    tag: "0.8.1"
   kfp:
     image: "ghcr.io/scc-digitalhub/digitalhub-sdk/wrapper-kfp"
-    tag: "0.8.0"
+    tag: "0.8.1"
   python:
     image: "ghcr.io/scc-digitalhub/digitalhub-serverless/python-runtime"
-    tag3_9: "3.9-0.8.0"
-    tag3_10: "3.10-0.8.0"
-    tag3_11: "3.11-0.8.0"
+    tag3_9: "3.9-0.8.1"
+    tag3_10: "3.10-0.8.1"
+    tag3_11: "3.11-0.8.1"
 
 initImage:
   builderTool:
@@ -258,3 +258,9 @@ additionalConfig:
     type: "NodePort"
   job:
     deadline: "604800"
+
+coreTokens:
+  accessTokenDuration: "43200"
+  refreshTokenDuration: "86400"
+
+configmapAdditionalEnv: {}
diff --git a/charts/kubernetes-resource-manager/Chart.yaml b/charts/kubernetes-resource-manager/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubernetes-resource-manager
 description: A Helm chart for Kubernetes
 type: application
-version: 0.2.4
+version: 0.2.5
 appVersion: "1.2.2"
 maintainers:
   - name: ffais

diff --git a/charts/kubernetes-resource-manager/templates/_helpers.tpl b/charts/kubernetes-resource-manager/templates/_helpers.tpl
@@ -133,6 +133,6 @@ Function for setting roles for KRM
 {{- define "kubernetes-resource-manager.roles" }}
 {{- range $i, $roles := .Values.oidc.access.roles }}
   ACCESS_ROLES_{{ $i }}_ROLE: {{ $roles.role }}
-  ACCESS_ROLES_{{ $i }}_RESOURCES: {{ $roles.resources }}
+  ACCESS_ROLES_{{ $i }}_RESOURCES: {{ $roles.resources | quote }}
 {{- end }}
 {{- end }}