helm: add extra volumes and extra volume mounts option for job resources (#15590)

* add a new line to the end of the credentials file when creating a user
* add extra volumes and mounts option into helm chart
* add extra volumes and extra volume mounts option for job resources
This commit is contained in:
Jan Šafařík 2022-08-29 06:17:30 +02:00 committed by GitHub
parent cd18599e7b
commit 92a0a59de2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 0 deletions

View File

@ -65,6 +65,9 @@ spec:
- key: {{ .Values.tls.publicCrt }}
path: CAs/public.crt
{{ end }}
{{- if .Values.makeBucketJob.extraVolumes }}
{{- toYaml .Values.makeBucketJob.extraVolumes | nindent 8 }}
{{- end }}
containers:
- name: minio-mc
image: "{{ .Values.mcImage.repository }}:{{ .Values.mcImage.tag }}"
@ -87,6 +90,9 @@ spec:
- name: cert-secret-volume-mc
mountPath: {{ .Values.configPathmc }}certs
{{ end }}
{{- if .Values.makeBucketJob.extraVolumeMounts }}
{{- toYaml .Values.makeBucketJob.extraVolumeMounts | nindent 10 }}
{{- end }}
resources:
{{ toYaml .Values.makeBucketJob.resources | indent 10 }}
{{- end }}

View File

@ -65,6 +65,9 @@ spec:
- key: {{ .Values.tls.publicCrt }}
path: CAs/public.crt
{{ end }}
{{- if .Values.makePolicyJob.extraVolumes }}
{{- toYaml .Values.makePolicyJob.extraVolumes | nindent 8 }}
{{- end }}
containers:
- name: minio-mc
image: "{{ .Values.mcImage.repository }}:{{ .Values.mcImage.tag }}"
@ -87,6 +90,9 @@ spec:
- name: cert-secret-volume-mc
mountPath: {{ .Values.configPathmc }}certs
{{ end }}
{{- if .Values.makePolicyJob.extraVolumeMounts }}
{{- toYaml .Values.makePolicyJob.extraVolumeMounts | nindent 10 }}
{{- end }}
resources:
{{ toYaml .Values.makePolicyJob.resources | indent 10 }}
{{- end }}

View File

@ -75,6 +75,9 @@ spec:
- key: {{ .Values.tls.publicCrt }}
path: CAs/public.crt
{{ end }}
{{- if .Values.makeUserJob.extraVolumes }}
{{- toYaml .Values.makeUserJob.extraVolumes | nindent 8 }}
{{- end }}
containers:
- name: minio-mc
image: "{{ .Values.mcImage.repository }}:{{ .Values.mcImage.tag }}"
@ -97,6 +100,9 @@ spec:
- name: cert-secret-volume-mc
mountPath: {{ .Values.configPathmc }}certs
{{ end }}
{{- if .Values.makeUserJob.extraVolumeMounts }}
{{- toYaml .Values.makeUserJob.extraVolumeMounts | nindent 10 }}
{{- end }}
resources:
{{ toYaml .Values.makeUserJob.resources | indent 10 }}
{{- end }}

View File

@ -316,6 +316,8 @@ makePolicyJob:
nodeSelector: {}
tolerations: []
affinity: {}
extraVolumes: []
extraVolumeMounts: []
# Command to run after the main command on exit
exitCommand: ""
@ -352,6 +354,8 @@ makeUserJob:
nodeSelector: {}
tolerations: []
affinity: {}
extraVolumes: []
extraVolumeMounts: []
# Command to run after the main command on exit
exitCommand: ""
@ -394,6 +398,8 @@ makeBucketJob:
nodeSelector: {}
tolerations: []
affinity: {}
extraVolumes: []
extraVolumeMounts: []
# Command to run after the main command on exit
exitCommand: ""