Browse Source

Helm: set serviceAccountName independent of cluster role (#8495)

* Add stale job expiry and expire API

* Add expire job button

* helm: decouple serviceAccountName from cluster role

---------

Co-authored-by: Copilot <copilot@github.com>
pull/8490/merge
Chris Lu 24 hours ago
committed by GitHub
parent
commit
1a3e3100d0
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      k8s/charts/seaweedfs/templates/master/master-statefulset.yaml
  2. 2
      k8s/charts/seaweedfs/templates/volume/volume-statefulset.yaml

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

@ -69,9 +69,7 @@ spec:
priorityClassName: {{ .Values.master.priorityClassName | quote }} priorityClassName: {{ .Values.master.priorityClassName | quote }}
{{- end }} {{- end }}
enableServiceLinks: false enableServiceLinks: false
{{- if .Values.global.createClusterRole }}
serviceAccountName: {{ .Values.master.serviceAccountName | default (include "seaweedfs.serviceAccountName" .) | quote }} # for deleting statefulset pods after migration serviceAccountName: {{ .Values.master.serviceAccountName | default (include "seaweedfs.serviceAccountName" .) | quote }} # for deleting statefulset pods after migration
{{- end }}
{{- if .Values.master.initContainers }} {{- if .Values.master.initContainers }}
initContainers: initContainers:
{{ tpl .Values.master.initContainers . | nindent 8 | trim }} {{ tpl .Values.master.initContainers . | nindent 8 | trim }}

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

@ -69,9 +69,7 @@ spec:
priorityClassName: {{ $volume.priorityClassName | quote }} priorityClassName: {{ $volume.priorityClassName | quote }}
{{- end }} {{- end }}
enableServiceLinks: false enableServiceLinks: false
{{- if $.Values.global.createClusterRole }}
serviceAccountName: {{ $volume.serviceAccountName | default (include "seaweedfs.serviceAccountName" $) | quote }} # for deleting statefulset pods after migration serviceAccountName: {{ $volume.serviceAccountName | default (include "seaweedfs.serviceAccountName" $) | quote }} # for deleting statefulset pods after migration
{{- end }}
{{- $initContainers_exists := include "volume.initContainers_exists" $ -}} {{- $initContainers_exists := include "volume.initContainers_exists" $ -}}
{{- if $initContainers_exists }} {{- if $initContainers_exists }}
initContainers: initContainers:

Loading…
Cancel
Save