Template the password secret name

trinodb · May 30, 2024 · 1fceb0a · 1fceb0a
1 parent 2ace482
commit 1fceb0a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/charts/trino/templates/_helpers.tpl b/charts/trino/templates/_helpers.tpl
@@ -120,3 +120,19 @@ Code is inspired from bitnami/common
   {{- end -}}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Create the name of the file auth secret to use
+*/}}
+{{- define "trino.fileAuthSecretName" -}}
+{{- if and .Values.auth .Values.auth.passwordAuthSecret }}
+{{- .Values.auth.passwordAuthSecret | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}-file-authentication
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}-file-authentication
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/trino/templates/deployment-coordinator.yaml b/charts/trino/templates/deployment-coordinator.yaml
@@ -70,11 +70,7 @@ spec:
         {{- if or .Values.auth.passwordAuth .Values.auth.passwordAuthSecret .Values.auth.groups }}
         - name: file-authentication-volume
           secret:
-            {{- if and .Values.auth .Values.auth.passwordAuthSecret }}
-            secretName: {{ .Values.auth.passwordAuthSecret }}
-            {{- else }}
-            secretName: trino-file-authentication
-            {{- end }}
+            secretName: {{ template "trino.fileAuthSecretName" . }}
             items:
               {{- if or .Values.auth.passwordAuth .Values.auth.passwordAuthSecret }}
               - key: password.db

diff --git a/charts/trino/templates/secret.yaml b/charts/trino/templates/secret.yaml
@@ -2,11 +2,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  {{- if and .Values.auth .Values.auth.passwordAuthSecret }}
-  name: {{ .Values.auth.passwordAuthSecret }}
-  {{- else }}
-  name: trino-file-authentication
-  {{- end }}
+  name: {{ template "trino.fileAuthSecretName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "trino.labels" . | nindent 4 }}