Browse Source

fix when we create serviceAccount value for master and volume statefulsets to be when global.createClusterRole is set to true

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

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

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

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

@ -49,7 +49,7 @@ spec:
priorityClassName: {{ .Values.volume.priorityClassName | quote }} priorityClassName: {{ .Values.volume.priorityClassName | quote }}
{{- end }} {{- end }}
enableServiceLinks: false enableServiceLinks: false
{{- if .Values.volume.serviceAccountName }}
{{- if .Values.global.createClusterRole }}
serviceAccountName: {{ default .Values.global.serviceAccountName .Values.volume.serviceAccountName }} # for deleting statefulset pods after migration 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" . -}}

Loading…
Cancel
Save