close #71

robjuz · May 5, 2024 · e413370 · e413370
1 parent 5837ac2
commit e413370
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/charts/kimai2/Chart.yaml b/charts/kimai2/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kimai2
 description: A Helm chart for Kubernetes
 type: application
-version: 4.0.3
+version: 4.1.0
 appVersion: "apache-2.16.1-prod"
 
 dependencies:

diff --git a/charts/kimai2/templates/_helpers.tpl b/charts/kimai2/templates/_helpers.tpl
@@ -52,6 +52,17 @@ Return the kimai Secret Name
 {{- end -}}
 {{- end -}}
 
+{{/*
+Return the Kimai configuration secret
+*/}}
+{{- define "kimai.configSecretName" -}}
+{{- if .Values.configurationFromSecret.secretName -}}
+    {{- printf "%s" (tpl .Values.configurationFromSecret.secretName $) -}}
+{{- else -}}
+    {{- printf "%s-config" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Return the Database Hostname
 */}}

diff --git a/charts/kimai2/templates/deployment.yaml b/charts/kimai2/templates/deployment.yaml
@@ -212,7 +212,7 @@ spec:
         {{- if .Values.configurationFromSecret.enabled}}
         - name: config
           secret:
-            secretName: {{ printf "%s-config" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
+            secretName: {{ include "kimai.configSecretName" . }}
         {{- end }}
         - name: kimai-data
           {{- if .Values.persistence.enabled }}