[bitnami/thanos] Modified serviceAccount name logic for Thanos (#13312)

Signed-off-by: Cori Avila <amisericordi@vmware.com>

Signed-off-by: Cori Avila <amisericordi@vmware.com>
This commit is contained in:
corico44
2022-11-03 13:20:19 +01:00
committed by GitHub
parent b3acaf02fd
commit 7915506500
3 changed files with 7 additions and 3 deletions

View File

@@ -28,4 +28,4 @@ name: thanos
sources:
- https://github.com/bitnami/containers/tree/main/bitnami/thanos
- https://thanos.io
version: 11.5.6
version: 11.5.7

View File

@@ -337,7 +337,11 @@ Usage:
{{- end -}}
{{- if not (include "thanos.serviceAccount.useExisting" (dict "component" .component "context" .context)) -}}
{{- if $component.serviceAccount.create -}}
{{ default (printf "%s-%s" (include "common.names.fullname" .context) .component) $component.serviceAccount.name }}
{{- if eq .context.Values.serviceAccount.name "" -}}
{{ default (printf "%s-%s" (include "common.names.fullname" .context) .component) $component.serviceAccount.name }}
{{- else -}}
{{ default (printf "%s-%s" (.context.Values.serviceAccount.name) .component) $component.serviceAccount.name }}
{{- end -}}
{{- else if .context.Values.serviceAccount.create -}}
{{ default (include "common.names.fullname" .context) .context.Values.serviceAccount.name }}
{{- else -}}

View File

@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "common.names.fullname" . }}
name: {{ include "thanos.serviceAccountName" . }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: storegateway