diff --git a/charts/hub/templates/kerberos-hub/hub-api.yaml b/charts/hub/templates/kerberos-hub/hub-api.yaml index 4842f72..d111cc9 100644 --- a/charts/hub/templates/kerberos-hub/hub-api.yaml +++ b/charts/hub/templates/kerberos-hub/hub-api.yaml @@ -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: diff --git a/charts/hub/templates/kerberos-hub/hub-cleanup.yaml b/charts/hub/templates/kerberos-hub/hub-cleanup.yaml index dae9b1d..3ef5e1a 100644 --- a/charts/hub/templates/kerberos-hub/hub-cleanup.yaml +++ b/charts/hub/templates/kerberos-hub/hub-cleanup.yaml @@ -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: diff --git a/charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml b/charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml index 7f6a98c..f7330f6 100644 --- a/charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml +++ b/charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml @@ -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: diff --git a/charts/hub/templates/kerberos-hub/hub-frontend.yaml b/charts/hub/templates/kerberos-hub/hub-frontend.yaml index fc10b6d..3bd342d 100644 --- a/charts/hub/templates/kerberos-hub/hub-frontend.yaml +++ b/charts/hub/templates/kerberos-hub/hub-frontend.yaml @@ -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: diff --git a/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml b/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml index 378dacf..aa484c9 100644 --- a/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml +++ b/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml @@ -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: diff --git a/charts/hub/templates/kerberos-hub/hub-serviceaccount.yaml b/charts/hub/templates/kerberos-hub/hub-serviceaccount.yaml index 3087a3e..bdd49ae 100644 --- a/charts/hub/templates/kerberos-hub/hub-serviceaccount.yaml +++ b/charts/hub/templates/kerberos-hub/hub-serviceaccount.yaml @@ -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 }} diff --git a/charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml b/charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml index 450a064..d2ff4ff 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml @@ -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: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-counting.yaml b/charts/hub/templates/kerberos-pipeline/pipe-counting.yaml index 0346306..4180666 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-counting.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-counting.yaml @@ -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: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml b/charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml index 0129c44..74e93d5 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml @@ -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: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-event.yaml b/charts/hub/templates/kerberos-pipeline/pipe-event.yaml index 4dc7c22..32003f3 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-event.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-event.yaml @@ -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: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-export.yaml b/charts/hub/templates/kerberos-pipeline/pipe-export.yaml index 1da0c81..d86626c 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-export.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-export.yaml @@ -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: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-monitor.yaml b/charts/hub/templates/kerberos-pipeline/pipe-monitor.yaml index 0243d54..1cb283c 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-monitor.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-monitor.yaml @@ -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: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-notify-test.yaml b/charts/hub/templates/kerberos-pipeline/pipe-notify-test.yaml index 35a65f9..a237f3a 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-notify-test.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-notify-test.yaml @@ -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: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-notify.yaml b/charts/hub/templates/kerberos-pipeline/pipe-notify.yaml index 70cd24e..b8ec533 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-notify.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-notify.yaml @@ -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: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-sequence.yaml b/charts/hub/templates/kerberos-pipeline/pipe-sequence.yaml index 216374a..2e8349f 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-sequence.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-sequence.yaml @@ -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: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml b/charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml index f275a51..3a4fb1c 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml @@ -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: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml b/charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml index 4e2dd31..0efc423 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml @@ -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: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml b/charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml index ff3f59d..39e3396 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml @@ -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: diff --git a/charts/hub/values.yaml b/charts/hub/values.yaml index e307bd4..592c8c4 100644 --- a/charts/hub/values.yaml +++ b/charts/hub/values.yaml @@ -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