Merge pull request #14 from sgibson91/ensure-lowercase-fullname

Some more fixes around naming conventions
2i2c-org · Sep 13, 2024 · 19fbf29 · 19fbf29
2 parents 8ba94f9 + 0411db4
commit 19fbf29
Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gcpFilestoreBackups/templates/_helpers.tpl b/gcpFilestoreBackups/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 Expand the name of the chart.
 */}}
 {{- define "gcpFilestoreBackups.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- default .Chart.Name .Values.nameOverride | lower | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
@@ -46,7 +46,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 Selector labels
 */}}
 {{- define "gcpFilestoreBackups.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "gcpFilestoreBackups.name" . }}
+app.kubernetes.io/name: {{ include "gcpFilestoreBackups.name" . | lower }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 

diff --git a/gcpFilestoreBackups/templates/deployment.yaml b/gcpFilestoreBackups/templates/deployment.yaml
@@ -21,7 +21,7 @@ spec:
         {{- toYaml . | nindent 8 }}
         {{- end }}
     spec:
-      serviceAccountName: {{ include "gcpFilestoreBackups.fullname" . }}
+      serviceAccountName: {{ include "gcpFilestoreBackups.serviceAccountName" . }}
       automountServiceAccountToken: False
       containers:
         - name: {{ .Chart.Name }}