allow to specify image pull secrets for service accounts
Signed-off-by: Pascal Sthamer <10992664+P4sca1@users.noreply.github.com>
This commit is contained in:
@@ -13,7 +13,7 @@ data:
|
||||
TZ: "{{ .Values.shuffle.timezone }}"
|
||||
BASE_URL: "http://{{ include "shuffle.backend.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:5001"
|
||||
KUBERNETES_NAMESPACE: "{{ .Release.Namespace }}"
|
||||
KUBERNETES_SERVICE_ACCOUNT: {{ include "shuffle.orborus.serviceAccountName" . }}
|
||||
KUBERNETES_SERVICE_ACCOUNT: {{ include "shuffle.orborus.serviceAccount.name" . }}
|
||||
SHUFFLE_WORKER_IMAGE: "{{ include "shuffle.worker.image" . }}"
|
||||
REGISTRY_URL: "{{ .Values.shuffle.appRegistry }}"
|
||||
SHUFFLE_SWARM_CONFIG: run
|
||||
|
||||
@@ -25,8 +25,8 @@ spec:
|
||||
{{- end }}
|
||||
labels: {{- include "shuffle.orborus.labels" ( dict "customLabels" $podLabels "context" $ ) | nindent 8 }}
|
||||
spec:
|
||||
{{- include "shuffle.imagePullSecrets" . | nindent 6 }}
|
||||
serviceAccountName: {{ template "shuffle.orborus.serviceAccountName" . }}
|
||||
{{- include "shuffle.orborus.imagePullSecrets" . | nindent 6 }}
|
||||
serviceAccountName: {{ template "shuffle.orborus.serviceAccount.name" . }}
|
||||
automountServiceAccountToken: {{ .Values.orborus.automountServiceAccountToken }}
|
||||
{{- if .Values.orborus.hostAliases }}
|
||||
hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.orborus.hostAliases "context" $) | nindent 8 }}
|
||||
@@ -87,9 +87,9 @@ spec:
|
||||
- name: IS_KUBERNETES
|
||||
value: "true"
|
||||
- name: SHUFFLE_WORKER_SERVICE_ACCOUNT_NAME
|
||||
value: {{ include "shuffle.worker.serviceAccountName" . }}
|
||||
value: {{ include "shuffle.worker.serviceAccount.name" . }}
|
||||
- name: SHUFFLE_APP_SERVICE_ACCOUNT_NAME
|
||||
value: {{ include "shuffle.app.serviceAccountName" . }}
|
||||
value: {{ include "shuffle.app.serviceAccount.name" . }}
|
||||
{{- if .Values.orborus.extraEnvVars }}
|
||||
{{- include "common.tplvalues.render" (dict "value" .Values.orborus.extraEnvVars "context" $) | nindent 12 }}
|
||||
{{- end }}
|
||||
|
||||
@@ -10,7 +10,7 @@ metadata:
|
||||
{{- end }}
|
||||
subjects:
|
||||
- kind: ServiceAccount
|
||||
name: {{ include "shuffle.orborus.serviceAccountName" . }}
|
||||
name: {{ include "shuffle.orborus.serviceAccount.name" . }}
|
||||
roleRef:
|
||||
apiGroup: rbac.authorization.k8s.io
|
||||
kind: Role
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
name: {{ include "shuffle.orborus.serviceAccountName" . }}
|
||||
name: {{ include "shuffle.orborus.serviceAccount.name" . }}
|
||||
namespace: {{ include "common.names.namespace" . | quote }}
|
||||
labels: {{- include "shuffle.orborus.labels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
|
||||
{{- if or .Values.orborus.serviceAccount.annotations .Values.commonAnnotations }}
|
||||
@@ -10,4 +10,5 @@ metadata:
|
||||
annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $ ) | nindent 4 }}
|
||||
{{- end }}
|
||||
automountServiceAccountToken: {{ .Values.orborus.serviceAccount.automountServiceAccountToken }}
|
||||
{{- include "shuffle.orborus.serviceAccount.imagePullSecrets" . | nindent 0 }}
|
||||
{{- end }}
|
||||
|
||||
Reference in New Issue
Block a user