Browse Source
[helm] add possibility to use array for imagePullSecrets (#4782)
add possibility to use array for imagePullSecrets
pull/4787/head
tikhon-opsfleet
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with
20 additions and
17 deletions
-
k8s/charts/seaweedfs/templates/_helpers.tpl
-
k8s/charts/seaweedfs/templates/filer-statefulset.yaml
-
k8s/charts/seaweedfs/templates/master-statefulset.yaml
-
k8s/charts/seaweedfs/templates/s3-deployment.yaml
-
k8s/charts/seaweedfs/templates/volume-statefulset.yaml
|
@ -183,3 +183,18 @@ Inject extra environment vars in the format key:value, if populated |
|
|
{{- printf "false" -}} |
|
|
{{- printf "false" -}} |
|
|
{{- end -}} |
|
|
{{- end -}} |
|
|
{{- end -}} |
|
|
{{- end -}} |
|
|
|
|
|
|
|
|
|
|
|
{{/* Return the proper imagePullSecrets */}} |
|
|
|
|
|
{{- define "seaweedfs.imagePullSecrets" -}} |
|
|
|
|
|
{{- if .Values.global.imagePullSecrets }} |
|
|
|
|
|
{{- if kindIs "string" .Values.global.imagePullSecrets }} |
|
|
|
|
|
imagePullSecrets: |
|
|
|
|
|
- name: {{ .Values.global.imagePullSecrets }} |
|
|
|
|
|
{{- else }} |
|
|
|
|
|
imagePullSecrets: |
|
|
|
|
|
{{- range .Values.global.imagePullSecrets }} |
|
|
|
|
|
- name: {{ . }} |
|
|
|
|
|
{{- end }} |
|
|
|
|
|
{{- end }} |
|
|
|
|
|
{{- end }} |
|
|
|
|
|
{{- end -}} |
|
@ -42,10 +42,7 @@ spec: |
|
|
tolerations: |
|
|
tolerations: |
|
|
{{ tpl .Values.filer.tolerations . | nindent 8 | trim }} |
|
|
{{ tpl .Values.filer.tolerations . | nindent 8 | trim }} |
|
|
{{- end }} |
|
|
{{- end }} |
|
|
{{- if .Values.global.imagePullSecrets }} |
|
|
|
|
|
imagePullSecrets: |
|
|
|
|
|
- name: {{ .Values.global.imagePullSecrets }} |
|
|
|
|
|
{{- end }} |
|
|
|
|
|
|
|
|
{{- 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: seaweedfs-rw-sa #hack for delete pod master after migration |
|
|
{{- end }} |
|
|
{{- end }} |
|
|
|
@ -42,10 +42,7 @@ spec: |
|
|
tolerations: |
|
|
tolerations: |
|
|
{{ tpl .Values.master.tolerations . | nindent 8 | trim }} |
|
|
{{ tpl .Values.master.tolerations . | nindent 8 | trim }} |
|
|
{{- end }} |
|
|
{{- end }} |
|
|
{{- if .Values.global.imagePullSecrets }} |
|
|
|
|
|
imagePullSecrets: |
|
|
|
|
|
- name: {{ .Values.global.imagePullSecrets }} |
|
|
|
|
|
{{- end }} |
|
|
|
|
|
|
|
|
{{- include "seaweedfs.imagePullSecrets" . | nindent 6 }} |
|
|
terminationGracePeriodSeconds: 60 |
|
|
terminationGracePeriodSeconds: 60 |
|
|
{{- if .Values.master.priorityClassName }} |
|
|
{{- if .Values.master.priorityClassName }} |
|
|
priorityClassName: {{ .Values.master.priorityClassName | quote }} |
|
|
priorityClassName: {{ .Values.master.priorityClassName | quote }} |
|
|
|
@ -30,10 +30,7 @@ spec: |
|
|
tolerations: |
|
|
tolerations: |
|
|
{{ tpl .Values.s3.tolerations . | nindent 8 | trim }} |
|
|
{{ tpl .Values.s3.tolerations . | nindent 8 | trim }} |
|
|
{{- end }} |
|
|
{{- end }} |
|
|
{{- if .Values.global.imagePullSecrets }} |
|
|
|
|
|
imagePullSecrets: |
|
|
|
|
|
- name: {{ .Values.global.imagePullSecrets }} |
|
|
|
|
|
{{- end }} |
|
|
|
|
|
|
|
|
{{- include "seaweedfs.imagePullSecrets" . | nindent 6 }} |
|
|
terminationGracePeriodSeconds: 10 |
|
|
terminationGracePeriodSeconds: 10 |
|
|
{{- if .Values.s3.priorityClassName }} |
|
|
{{- if .Values.s3.priorityClassName }} |
|
|
priorityClassName: {{ .Values.s3.priorityClassName | quote }} |
|
|
priorityClassName: {{ .Values.s3.priorityClassName | quote }} |
|
|
|
@ -36,10 +36,7 @@ spec: |
|
|
tolerations: |
|
|
tolerations: |
|
|
{{ tpl .Values.volume.tolerations . | nindent 8 | trim }} |
|
|
{{ tpl .Values.volume.tolerations . | nindent 8 | trim }} |
|
|
{{- end }} |
|
|
{{- end }} |
|
|
{{- if .Values.global.imagePullSecrets }} |
|
|
|
|
|
imagePullSecrets: |
|
|
|
|
|
- name: {{ .Values.global.imagePullSecrets }} |
|
|
|
|
|
{{- end }} |
|
|
|
|
|
|
|
|
{{- include "seaweedfs.imagePullSecrets" . | nindent 6 }} |
|
|
terminationGracePeriodSeconds: 150 |
|
|
terminationGracePeriodSeconds: 150 |
|
|
{{- if .Values.volume.priorityClassName }} |
|
|
{{- if .Values.volume.priorityClassName }} |
|
|
priorityClassName: {{ .Values.volume.priorityClassName | quote }} |
|
|
priorityClassName: {{ .Values.volume.priorityClassName | quote }} |
|
|