From 24ae32e495feb339e1ba866f7f2a812cb1e12566 Mon Sep 17 00:00:00 2001 From: ChrisCooney1 <67274141+ChrisCooney1@users.noreply.github.com> Date: Thu, 3 Sep 2020 02:15:40 +0100 Subject: [PATCH] [stable/chartmuseum] fixed name of service account (#23670) * fix: fixed name of service account Signed-off-by: Chris Cooney * Bumped the chart version Signed-off-by: Chris Cooney * Added conditional logic to deployment Signed-off-by: Chris Cooney --- stable/chartmuseum/Chart.yaml | 2 +- stable/chartmuseum/templates/deployment.yaml | 4 +++- stable/chartmuseum/templates/serviceaccount.yaml | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/stable/chartmuseum/Chart.yaml b/stable/chartmuseum/Chart.yaml index d33ab8339f..c65dc27ba9 100644 --- a/stable/chartmuseum/Chart.yaml +++ b/stable/chartmuseum/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: Host your own Helm Chart Repository name: chartmuseum -version: 2.13.2 +version: 2.13.3 appVersion: 0.12.0 home: https://github.com/helm/chartmuseum icon: https://raw.githubusercontent.com/helm/chartmuseum/master/logo2.png diff --git a/stable/chartmuseum/templates/deployment.yaml b/stable/chartmuseum/templates/deployment.yaml index d30a900059..6cf1c0c379 100644 --- a/stable/chartmuseum/templates/deployment.yaml +++ b/stable/chartmuseum/templates/deployment.yaml @@ -163,7 +163,9 @@ spec: {{- if .Values.deployment.schedulerName }} schedulerName: {{ .Values.deployment.schedulerName }} {{- end -}} - {{- if .Values.serviceAccount.create }} + {{- if and .Values.serviceAccount.create .Values.serviceAccount.name }} + serviceAccountName: {{ .Values.serviceAccount.name }} + {{- else if .Values.serviceAccount.create }} serviceAccountName: {{ include "chartmuseum.fullname" . }} {{- else if .Values.serviceAccount.name }} serviceAccountName: {{ .Values.serviceAccount.name }} diff --git a/stable/chartmuseum/templates/serviceaccount.yaml b/stable/chartmuseum/templates/serviceaccount.yaml index eee7cca267..25613955cf 100644 --- a/stable/chartmuseum/templates/serviceaccount.yaml +++ b/stable/chartmuseum/templates/serviceaccount.yaml @@ -3,7 +3,11 @@ apiVersion: v1 kind: ServiceAccount metadata: +{{- if .Values.serviceAccount.name }} + name: {{ .Values.serviceAccount.name }} +{{- else }} name: {{ include "chartmuseum.fullname" . }} +{{- end }} labels: {{ include "chartmuseum.labels.standard" . | indent 4 }} {{- if .Values.serviceAccount.annotations }}