feat/fix(dhcore): added token exchange support, keystore, modified en…

charts/core/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: core
 description: Core backend application for DigitalHub.
 type: application
-version: 0.1.37
-appVersion: "0.6.0"
+version: 0.1.38
+appVersion: "0.7.0-beta1"
 maintainers:
   - name: ffais
     url: https://github.com/ffais

charts/core/templates/configmap.yaml

@@ -56,3 +56,9 @@ data:
   DOCKER_REGISTRY_SECRET: {{ .Values.global.registry.secretName }}
 {{- end }}
   DH_CORS_ORIGINS: {{ .Values.corsOrigin | quote }}
+{{- if .Values.keystore.secretName }}
+  JWT_KEYSTORE_PATH: "/etc/keystore/{{ .Values.keystore.keyName }}"
+  JWT_KEYSTORE_KID: {{ .Values.keystore.keystoreKid }}
+{{- end }}
+  AWS_DEFAULT_REGION: {{ .Values.minio.awsDefaultRegion }}
+  AWS_REGION: {{ .Values.minio.awsRegion }}

charts/core/templates/deployment.yaml

@@ -48,36 +48,16 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
-            - name: DH_S3_ACCESS_KEY_ID
+            - name: AWS_ACCESS_KEY
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.global.minio.digitalhubUserSecret }}
                   key: digitalhubUser
-            - name: DH_S3_SECRET_ACCESS_KEY
+            - name: AWS_SECRET_KEY
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.global.minio.digitalhubUserSecret }}
                   key: digitalhubPassword
-            - name: DH_AWS_ACCESS_KEY_ID
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.global.minio.digitalhubUserSecret }}
-                  key: digitalhubUser
-            - name: DH_AWS_SECRET_ACCESS_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.global.minio.digitalhubUserSecret }}
-                  key: digitalhubPassword
-            - name: DH_POSTGRES_USER
-              valueFrom:
-                secretKeyRef:
-                  name: digitalhub-owner-user.database-postgres-cluster.credentials.postgresql.acid.zalan.do
-                  key: username
-            - name: DH_POSTGRES_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: digitalhub-owner-user.database-postgres-cluster.credentials.postgresql.acid.zalan.do
-                  key: password
             - name: JDBC_USER
               valueFrom:
                 secretKeyRef:
@@ -111,6 +91,16 @@ spec:
               value: {{ .Values.authentication.openId.oidcClientId }}
               {{- end }}
             {{- end }}
+            - name: JWT_CLIENT_ID
+              valueFrom:
+                secretKeyRef:
+                  name: core-auth-creds
+                  key: clientId
+            - name: JWT_CLIENT_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: core-auth-creds
+                  key: clientSecret
           envFrom:
           - configMapRef:
               name: {{ include "core.fullname" . }}
@@ -120,12 +110,22 @@ spec:
               protocol: TCP
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
-          {{- with .Values.volumeMounts }}
           volumeMounts:
+          {{- if .Values.keystore.secretName }}
+            - name: keystore
+              mountPath: "/etc/keystore/{{ .Values.keystore.keyName }}"
+              subPath: {{ .Values.keystore.keyName }}
+          {{- end }}
+          {{- with .Values.volumeMounts }}
             {{- toYaml . | nindent 12 }}
           {{- end }}
-      {{- with .Values.volumes }}
       volumes:
+      {{- if .Values.keystore.secretName }}
+        - name: keystore
+          secret:
+            secretName: {{ .Values.keystore.secretName }}
+      {{- end }}
+      {{- with .Values.volumes }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- with .Values.nodeSelector }}

charts/core/templates/secret.yaml

@@ -5,4 +5,17 @@ metadata:
 type: Opaque
 data:
   username: {{ .Values.events.rabbitmq.credentials.username | b64enc | quote }}
-  password: {{ .Values.events.rabbitmq.credentials.password | b64enc | quote }}
+  password: {{ .Values.events.rabbitmq.credentials.password | b64enc | quote }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: core-auth-creds
+  annotations:
+    "helm.sh/hook": pre-install
+    "helm.sh/hook-weight": "-4"
+    "helm.sh/hook-delete-policy": hook-failed
+type: Opaque
+data:
+  clientId: {{ randAlphaNum 24 | nospace | b64enc }}
+  clientSecret: {{ randAlphaNum 24 | nospace | b64enc }}

charts/core/values.yaml

@@ -59,6 +59,8 @@ minio:
   endpointPort: "9000"
   bucket: "mlrun"
   protocol: "http"
+  awsDefaultRegion: ""
+  awsRegion: ""
 
 service:
   port: "8080"
@@ -147,15 +149,15 @@ runtime:
     tag: "0.6.1"
   dbt:
     image: "ghcr.io/scc-digitalhub/digitalhub-sdk/wrapper-dbt"
-    tag: "0.6.1"
+    tag: "0.7.0b0"
   kfp:
     image: "ghcr.io/scc-digitalhub/digitalhub-sdk/wrapper-kfp"
-    tag: "0.6.1"
+    tag: "0.7.0b0"
   python:
     image: "ghcr.io/scc-digitalhub/digitalhub-serverless/python-runtime"
-    tag3_9: "3.9-0.6.1"
-    tag3_10: "3.10-0.6.1"
-    tag3_11: "3.11-0.6.1"
+    tag3_9: "3.9-0.7.0b0"
+    tag3_10: "3.10-0.7.0b0"
+    tag3_11: "3.11-0.7.0b0"
 
 authentication:
   basic:
@@ -205,3 +207,8 @@ corsOrigin: ""
 registry:
   kaniko:
     imagePrefix: ""
+
+keystore:
+  secretName: ""
+  keyName: ""
+  keystoreKid: ""