From 78429f943ca314fc5f7a248fc5759351a69213d3 Mon Sep 17 00:00:00 2001
From: Calcagiara <jacopocristoforitn@gmail.com>
Date: Wed, 16 Oct 2024 16:23:24 +0200
Subject: [PATCH] fix(core): fixed keystore creation conditions

---
 charts/core/Chart.yaml                | 2 +-
 charts/core/templates/configmap.yaml  | 4 ++--
 charts/core/templates/deployment.yaml | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/charts/core/Chart.yaml b/charts/core/Chart.yaml
index d048180..0dd8e43 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.15
+version: 0.2.16
 appVersion: "0.8.0-beta4"
 maintainers:
   - name: ffais
diff --git a/charts/core/templates/configmap.yaml b/charts/core/templates/configmap.yaml
index 5bb2084..1233808 100644
--- a/charts/core/templates/configmap.yaml
+++ b/charts/core/templates/configmap.yaml
@@ -60,10 +60,10 @@ data:
 {{- end }}
   KANIKO_ARGS: {{ .Values.kanikoArgs | quote }}
   DH_CORS_ORIGINS: {{ .Values.corsOrigin | quote }}
-{{- if and .Values.keystore.existingSecret.secretName .Values.keystore.existingSecret.keystorePath }}
+{{- if and .Values.keystore.existingSecret.secretName .Values.keystore.keystorePath }}
   JWT_KEYSTORE_PATH: "{{ .Values.keystore.keystorePath }}/{{ .Values.keystore.existingSecret.keyName }}"
   JWT_KEYSTORE_KID: {{ .Values.keystore.keystoreKid | quote }}
-{{- else if and (not .Values.keystore.existingSecret.secretName) .Values.keystore.existingSecret.keystorePath -}}
+{{- else if and (not .Values.keystore.existingSecret.secretName) .Values.keystore.keystorePath }}
   JWT_KEYSTORE_PATH: "{{ .Values.keystore.keystorePath }}/keystore.jwks"
   JWT_KEYSTORE_KID: {{ .Values.keystore.keystoreKid | quote }}
 {{- end }}
diff --git a/charts/core/templates/deployment.yaml b/charts/core/templates/deployment.yaml
index 32cbfde..bfe173d 100644
--- a/charts/core/templates/deployment.yaml
+++ b/charts/core/templates/deployment.yaml
@@ -128,7 +128,7 @@ spec:
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:
-          {{- if and .Values.keystore.existingSecret.secretName .Values.keystore.existingSecret.keystorePath }}
+          {{- if and .Values.keystore.existingSecret.secretName .Values.keystore.keystorePath }}
             - name: keystore
               mountPath: "{{ .Values.keystore.keystorePath }}/{{ .Values.keystore.existingSecret.keyName }}"
               subPath: {{ .Values.keystore.existingSecret.keyName }}
@@ -137,7 +137,7 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
       volumes:
-      {{- if and .Values.keystore.existingSecret.secretName .Values.keystore.existingSecret.keystorePath }}
+      {{- if and .Values.keystore.existingSecret.secretName .Values.keystore.keystorePath }}
         - name: keystore
           secret:
             secretName: {{ .Values.keystore.existingSecret.secretName }}