From 489c804c35e0a14ce10e5827796cacc637c2d4f5 Mon Sep 17 00:00:00 2001
From: Calcagiara <jacopocristoforitn@gmail.com>
Date: Wed, 28 Aug 2024 15:55:54 +0200
Subject: [PATCH 1/2] feat(aac): added keystore support

---
 charts/aac/Chart.yaml                |  2 +-
 charts/aac/templates/configmap.yaml  |  2 +-
 charts/aac/templates/deployment.yaml | 14 ++++++++++++--
 charts/aac/values.yaml               |  5 ++++-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/charts/aac/Chart.yaml b/charts/aac/Chart.yaml
index 3de92fa..6906546 100644
--- a/charts/aac/Chart.yaml
+++ b/charts/aac/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: aac
 description: A Helm chart for Kubernetes
 type: application
-version: 0.1.9
+version: 0.1.10
 appVersion: "5.0.0"
 maintainers:
   - name: ffais
diff --git a/charts/aac/templates/configmap.yaml b/charts/aac/templates/configmap.yaml
index d7bd7a3..0b8deb0 100644
--- a/charts/aac/templates/configmap.yaml
+++ b/charts/aac/templates/configmap.yaml
@@ -18,5 +18,5 @@ data:
   APPLICATION_EXT_URL: {{ .Values.config.applicationExtUrl }}
   APPLICATION_EMAIL: {{ .Values.config.mailSender }}
   {{ if .Values.config.keystorePath -}}
-  JWK_KEYSTORE: {{ .Values.config.keystorePath }}
+  JWK_KEYSTORE: "/etc/keystore/{{ .Values.keystore.keyName }}"
   {{ end -}}
diff --git a/charts/aac/templates/deployment.yaml b/charts/aac/templates/deployment.yaml
index 4f9b836..ae42677 100644
--- a/charts/aac/templates/deployment.yaml
+++ b/charts/aac/templates/deployment.yaml
@@ -114,15 +114,25 @@ 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 }}
           envFrom:
           - configMapRef:
               name: {{ include "aac.fullname" . }}
-      {{- 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 }}
diff --git a/charts/aac/values.yaml b/charts/aac/values.yaml
index dba4e82..bd70846 100644
--- a/charts/aac/values.yaml
+++ b/charts/aac/values.yaml
@@ -124,7 +124,6 @@ config:
   mailSender: ""
   mailDebug: "false"
   applicationExtUrl: ""
-  keystorePath: ""
 
 # Secrets
 
@@ -175,3 +174,7 @@ secrets:
   annotations: {}
   reflector:
     enabled: false
+
+keystore:
+  secretName: ""
+  keyName: ""

From 0c40d6570c5011c4597f82c09171a25211aa2113 Mon Sep 17 00:00:00 2001
From: Calcagiara <jacopocristoforitn@gmail.com>
Date: Wed, 28 Aug 2024 15:58:19 +0200
Subject: [PATCH 2/2] bump/fix(core): added init image, changed workflow
 variable, bumped versions

---
 charts/core/Chart.yaml                          | 2 +-
 charts/core/templates/configmap-digitalhub.yaml | 2 +-
 charts/core/templates/configmap.yaml            | 1 +
 charts/core/values.yaml                         | 9 +++++++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/charts/core/Chart.yaml b/charts/core/Chart.yaml
index 3f4818c..6de7909 100644
--- 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.2
+version: 0.2.3
 appVersion: "0.7.0-beta3"
 maintainers:
   - name: ffais
diff --git a/charts/core/templates/configmap-digitalhub.yaml b/charts/core/templates/configmap-digitalhub.yaml
index a7181d4..aba3b3f 100644
--- 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 }}
-  DIGITALHUB_CORE_WORKFLOW_IMAGE: {{ .Values.runtime.kfp.image }}
+  DHCORE_WORKFLOW_IMAGE: {{ .Values.runtime.kfp.image }}
   KFP_ENDPOINT: http://ml-pipeline:8888
   MLRUN_DBPATH: http://mlrun-api:8080
   DHCORE_ENDPOINT: "{{ include "core.endpoint" . }}"
diff --git a/charts/core/templates/configmap.yaml b/charts/core/templates/configmap.yaml
index fbd1584..8275b6a 100644
--- a/charts/core/templates/configmap.yaml
+++ b/charts/core/templates/configmap.yaml
@@ -66,3 +66,4 @@ data:
 {{- if .Values.profiles }}
   K8S_TEMPLATES: {{ include "core.profiles" . | quote }}
 {{- end }}
+  K8S_INIT_IMAGE: "{{ .Values.initImage.builderTool.image }}:{{ .Values.initImage.builderTool.tag }}"
diff --git a/charts/core/values.yaml b/charts/core/values.yaml
index 19bdbb5..74d9f0d 100644
--- a/charts/core/values.yaml
+++ b/charts/core/values.yaml
@@ -154,16 +154,21 @@ kfp:
 runtime:
   dbt:
     image: "ghcr.io/scc-digitalhub/digitalhub-sdk/wrapper-dbt"
-    tag: "0.7.0b2"
+    tag: "0.7.0b3"
   kfp:
     image: "ghcr.io/scc-digitalhub/digitalhub-sdk/wrapper-kfp"
-    tag: "0.7.0b2"
+    tag: "0.7.0b3"
   python:
     image: "ghcr.io/scc-digitalhub/digitalhub-serverless/python-runtime"
     tag3_9: "3.9-0.7.0b2"
     tag3_10: "3.10-0.7.0b2"
     tag3_11: "3.11-0.7.0b2"
 
+initImage:
+  builderTool:
+    image: "ghcr.io/scc-digitalhub/digitalhub-core-builder-tool"
+    tag: "latest"
+
 authentication:
   basic:
     enabled: true