Refactor service account name assignment to use a default format in multiple YAML templates

This commit is contained in:
Cédric Verstraeten
2026-03-07 19:23:24 +00:00
parent b6f7b14c80
commit 4373e7cafe
19 changed files with 20 additions and 19 deletions

View File

@@ -121,7 +121,7 @@ spec:
app: hub-api
spec:
{{- if .Values.kerberoshub.serviceAccount.create }}
serviceAccountName: {{ .Values.kerberoshub.serviceAccount.name }}
serviceAccountName: {{ default (printf "%s-%s-sa" .Release.Name .Chart.Name | trunc 63 | trimSuffix "-") .Values.kerberoshub.serviceAccount.name }}
{{- end }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:

View File

@@ -22,7 +22,7 @@ spec:
app: hub-cleanup
spec:
{{- if .Values.kerberoshub.serviceAccount.create }}
serviceAccountName: {{ .Values.kerberoshub.serviceAccount.name }}
serviceAccountName: {{ default (printf "%s-%s-sa" .Release.Name .Chart.Name | trunc 63 | trimSuffix "-") .Values.kerberoshub.serviceAccount.name }}
{{- end }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:

View File

@@ -82,7 +82,7 @@ spec:
app: hub-frontend-demo
spec:
{{- if .Values.kerberoshub.serviceAccount.create }}
serviceAccountName: {{ .Values.kerberoshub.serviceAccount.name }}
serviceAccountName: {{ default (printf "%s-%s-sa" .Release.Name .Chart.Name | trunc 63 | trimSuffix "-") .Values.kerberoshub.serviceAccount.name }}
{{- end }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:

View File

@@ -161,7 +161,7 @@ spec:
app: hub-frontend
spec:
{{- if .Values.kerberoshub.serviceAccount.create }}
serviceAccountName: {{ .Values.kerberoshub.serviceAccount.name }}
serviceAccountName: {{ default (printf "%s-%s-sa" .Release.Name .Chart.Name | trunc 63 | trimSuffix "-") .Values.kerberoshub.serviceAccount.name }}
{{- end }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:

View File

@@ -22,7 +22,7 @@ spec:
app: hub-monitor-device
spec:
{{- if .Values.kerberoshub.serviceAccount.create }}
serviceAccountName: {{ .Values.kerberoshub.serviceAccount.name }}
serviceAccountName: {{ default (printf "%s-%s-sa" .Release.Name .Chart.Name | trunc 63 | trimSuffix "-") .Values.kerberoshub.serviceAccount.name }}
{{- end }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:

View File

@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ .Values.kerberoshub.serviceAccount.name }}
name: {{ default (printf "%s-%s-sa" .Release.Name .Chart.Name | trunc 63 | trimSuffix "-") .Values.kerberoshub.serviceAccount.name }}
namespace: {{ .Release.Namespace }}
annotations:
{{- toYaml .Values.kerberoshub.serviceAccount.annotations | nindent 4 }}

View File

@@ -22,7 +22,7 @@ spec:
app: pipe-analysis
spec:
{{- if .Values.kerberoshub.serviceAccount.create }}
serviceAccountName: {{ .Values.kerberoshub.serviceAccount.name }}
serviceAccountName: {{ default (printf "%s-%s-sa" .Release.Name .Chart.Name | trunc 63 | trimSuffix "-") .Values.kerberoshub.serviceAccount.name }}
{{- end }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:

View File

@@ -20,7 +20,7 @@ spec:
app: pipe-counting
spec:
{{- if .Values.kerberoshub.serviceAccount.create }}
serviceAccountName: {{ .Values.kerberoshub.serviceAccount.name }}
serviceAccountName: {{ default (printf "%s-%s-sa" .Release.Name .Chart.Name | trunc 63 | trimSuffix "-") .Values.kerberoshub.serviceAccount.name }}
{{- end }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:

View File

@@ -20,7 +20,7 @@ spec:
app: pipe-dominantcolor
spec:
{{- if .Values.kerberoshub.serviceAccount.create }}
serviceAccountName: {{ .Values.kerberoshub.serviceAccount.name }}
serviceAccountName: {{ default (printf "%s-%s-sa" .Release.Name .Chart.Name | trunc 63 | trimSuffix "-") .Values.kerberoshub.serviceAccount.name }}
{{- end }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:

View File

@@ -22,7 +22,7 @@ spec:
app: pipe-event
spec:
{{- if .Values.kerberoshub.serviceAccount.create }}
serviceAccountName: {{ .Values.kerberoshub.serviceAccount.name }}
serviceAccountName: {{ default (printf "%s-%s-sa" .Release.Name .Chart.Name | trunc 63 | trimSuffix "-") .Values.kerberoshub.serviceAccount.name }}
{{- end }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:

View File

@@ -22,7 +22,7 @@ spec:
app: pipe-export
spec:
{{- if .Values.kerberoshub.serviceAccount.create }}
serviceAccountName: {{ .Values.kerberoshub.serviceAccount.name }}
serviceAccountName: {{ default (printf "%s-%s-sa" .Release.Name .Chart.Name | trunc 63 | trimSuffix "-") .Values.kerberoshub.serviceAccount.name }}
{{- end }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:

View File

@@ -22,7 +22,7 @@ spec:
app: pipe-monitor
spec:
{{- if .Values.kerberoshub.serviceAccount.create }}
serviceAccountName: {{ .Values.kerberoshub.serviceAccount.name }}
serviceAccountName: {{ default (printf "%s-%s-sa" .Release.Name .Chart.Name | trunc 63 | trimSuffix "-") .Values.kerberoshub.serviceAccount.name }}
{{- end }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:

View File

@@ -22,7 +22,7 @@ spec:
app: pipe-notify-test
spec:
{{- if .Values.kerberoshub.serviceAccount.create }}
serviceAccountName: {{ .Values.kerberoshub.serviceAccount.name }}
serviceAccountName: {{ default (printf "%s-%s-sa" .Release.Name .Chart.Name | trunc 63 | trimSuffix "-") .Values.kerberoshub.serviceAccount.name }}
{{- end }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:

View File

@@ -22,7 +22,7 @@ spec:
app: pipe-notify
spec:
{{- if .Values.kerberoshub.serviceAccount.create }}
serviceAccountName: {{ .Values.kerberoshub.serviceAccount.name }}
serviceAccountName: {{ default (printf "%s-%s-sa" .Release.Name .Chart.Name | trunc 63 | trimSuffix "-") .Values.kerberoshub.serviceAccount.name }}
{{- end }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:

View File

@@ -22,7 +22,7 @@ spec:
app: pipe-sequence
spec:
{{- if .Values.kerberoshub.serviceAccount.create }}
serviceAccountName: {{ .Values.kerberoshub.serviceAccount.name }}
serviceAccountName: {{ default (printf "%s-%s-sa" .Release.Name .Chart.Name | trunc 63 | trimSuffix "-") .Values.kerberoshub.serviceAccount.name }}
{{- end }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:

View File

@@ -21,7 +21,7 @@ spec:
app: pipe-sprite
spec:
{{- if .Values.kerberoshub.serviceAccount.create }}
serviceAccountName: {{ .Values.kerberoshub.serviceAccount.name }}
serviceAccountName: {{ default (printf "%s-%s-sa" .Release.Name .Chart.Name | trunc 63 | trimSuffix "-") .Values.kerberoshub.serviceAccount.name }}
{{- end }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:

View File

@@ -22,7 +22,7 @@ spec:
app: pipe-throttler
spec:
{{- if .Values.kerberoshub.serviceAccount.create }}
serviceAccountName: {{ .Values.kerberoshub.serviceAccount.name }}
serviceAccountName: {{ default (printf "%s-%s-sa" .Release.Name .Chart.Name | trunc 63 | trimSuffix "-") .Values.kerberoshub.serviceAccount.name }}
{{- end }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:

View File

@@ -20,7 +20,7 @@ spec:
app: pipe-thumbnail
spec:
{{- if .Values.kerberoshub.serviceAccount.create }}
serviceAccountName: {{ .Values.kerberoshub.serviceAccount.name }}
serviceAccountName: {{ default (printf "%s-%s-sa" .Release.Name .Chart.Name | trunc 63 | trimSuffix "-") .Values.kerberoshub.serviceAccount.name }}
{{- end }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:

View File

@@ -169,6 +169,7 @@ admin:
cookieSecret: "generate-a-random-cookie-secret"
organization: "github-organization"
team: "github-team"
###########################################################################
# Following are all the different deployments needed to make
# Hub properly working.
@@ -180,7 +181,7 @@ kerberoshub:
# value: "custom_value"
serviceAccount:
# serviceAccount.create Enable creation of ServiceAccount
create: true
create: false
# If create is set to false, a name is not used in helm chart
name: ""
# additional ServiceAccount annotations