Browse Source

prefer global.serviceAccountName when available for all statefulsets

pull/5050/head
jessebot 1 year ago
committed by Chris Lu
parent
commit
c332832f0b
  1. 2
      k8s/charts/seaweedfs/templates/filer-statefulset.yaml
  2. 2
      k8s/charts/seaweedfs/templates/master-statefulset.yaml
  3. 2
      k8s/charts/seaweedfs/templates/volume-statefulset.yaml

2
k8s/charts/seaweedfs/templates/filer-statefulset.yaml

@ -52,7 +52,7 @@ spec:
{{- end }} {{- end }}
{{- include "seaweedfs.imagePullSecrets" . | nindent 6 }} {{- include "seaweedfs.imagePullSecrets" . | nindent 6 }}
{{- if .Values.global.createClusterRole }} {{- if .Values.global.createClusterRole }}
serviceAccountName: seaweedfs-rw-sa #hack for delete pod master after migration
serviceAccountName: {{ default .Values.global.serviceAccountName .Values.filer.serviceAccountName }} # for deleting statefulset pods after migration
{{- end }} {{- end }}
terminationGracePeriodSeconds: 60 terminationGracePeriodSeconds: 60
{{- if .Values.filer.priorityClassName }} {{- if .Values.filer.priorityClassName }}

2
k8s/charts/seaweedfs/templates/master-statefulset.yaml

@ -56,7 +56,7 @@ spec:
{{- end }} {{- end }}
enableServiceLinks: false enableServiceLinks: false
{{- if .Values.master.serviceAccountName }} {{- if .Values.master.serviceAccountName }}
serviceAccountName: {{ .Values.master.serviceAccountName | quote }}
serviceAccountName: {{ default .Values.global.serviceAccountName .Values.master.serviceAccountName }} # for deleting statefulset pods after migration
{{- end }} {{- end }}
{{- if .Values.master.initContainers }} {{- if .Values.master.initContainers }}
initContainers: initContainers:

2
k8s/charts/seaweedfs/templates/volume-statefulset.yaml

@ -50,7 +50,7 @@ spec:
{{- end }} {{- end }}
enableServiceLinks: false enableServiceLinks: false
{{- if .Values.volume.serviceAccountName }} {{- if .Values.volume.serviceAccountName }}
serviceAccountName: {{ .Values.volume.serviceAccountName | quote }}
serviceAccountName: {{ default .Values.global.serviceAccountName .Values.volume.serviceAccountName }} # for deleting statefulset pods after migration
{{- end }} {{- end }}
{{- $initContainers_exists := include "volume.initContainers_exists" . -}} {{- $initContainers_exists := include "volume.initContainers_exists" . -}}
{{- if $initContainers_exists }} {{- if $initContainers_exists }}

Loading…
Cancel
Save