MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-02-02 17:35:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Split toleration, nodeSelector and affinity from main pods and jobs (#13247)

Browse Source
This commit is contained in:
Goncharov Sergey 2021-09-18 21:09:09 +03:00 committed by GitHub
parent a244753f47
commit d3564a4b09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helm/minio/Chart.yaml
View File

@ -1,7 +1,7 @@
apiVersion: v1 apiVersion: v1
description: Multi-Cloud Object Storage description: Multi-Cloud Object Storage
name: minio name: minio
version: 3.1.2 version: 3.1.3
appVersion: RELEASE.2021-09-09T21-37-07Z appVersion: RELEASE.2021-09-09T21-37-07Z
keywords: keywords:
- minio - minio

4
helm/minio/templates/deployment.yaml
View File

@ -91,6 +91,10 @@ spec:
secretKeyRef: secretKeyRef:
name: {{ template "minio.secretName" . }} name: {{ template "minio.secretName" . }}
key: rootPassword key: rootPassword
{{- if .Values.metrics.serviceMonitor.public }}
- name: MINIO_PROMETHEUS_AUTH_TYPE
value: "public"
{{- end}}
{{- range $key, $val := .Values.environment }} {{- range $key, $val := .Values.environment }}
- name: {{ $key }} - name: {{ $key }}
value: {{ $val | quote }} value: {{ $val | quote }}

4
helm/minio/templates/gateway-deployment.yaml
View File

@ -91,6 +91,10 @@ spec:
secretKeyRef: secretKeyRef:
name: {{ template "minio.secretName" . }} name: {{ template "minio.secretName" . }}
key: rootPassword key: rootPassword
{{- if .Values.metrics.serviceMonitor.public }}
- name: MINIO_PROMETHEUS_AUTH_TYPE
value: "public"
{{- end}}
{{- range $key, $val := .Values.environment }} {{- range $key, $val := .Values.environment }}
- name: {{ $key }} - name: {{ $key }}
value: {{ $val | quote }} value: {{ $val | quote }}

6
helm/minio/templates/post-install-create-bucket-job.yaml
View File

@ -32,13 +32,13 @@ spec:
{{- include "minio.imagePullSecrets" . | indent 6 }} {{- include "minio.imagePullSecrets" . | indent 6 }}
{{- if .Values.nodeSelector }} {{- if .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }} {{ toYaml .Values.makeBucketJob.nodeSelector | indent 8 }}
{{- end }} {{- end }}
{{- with .Values.affinity }} {{- with .Values.makeBucketJob.affinity }}
affinity: affinity:
{{ toYaml . | indent 8 }} {{ toYaml . | indent 8 }}
{{- end }} {{- end }}
{{- with .Values.tolerations }} {{- with .Values.makeBucketJob.tolerations }}
tolerations: tolerations:
{{ toYaml . | indent 8 }} {{ toYaml . | indent 8 }}
{{- end }} {{- end }}

6
helm/minio/templates/post-install-create-user-job.yaml
View File

@ -32,13 +32,13 @@ spec:
{{- include "minio.imagePullSecrets" . | indent 6 }} {{- include "minio.imagePullSecrets" . | indent 6 }}
{{- if .Values.nodeSelector }} {{- if .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }} {{ toYaml .Values.makeUserJob.nodeSelector | indent 8 }}
{{- end }} {{- end }}
{{- with .Values.affinity }} {{- with .Values.makeUserJob.affinity }}
affinity: affinity:
{{ toYaml . | indent 8 }} {{ toYaml . | indent 8 }}
{{- end }} {{- end }}
{{- with .Values.tolerations }} {{- with .Values.makeUserJob.tolerations }}
tolerations: tolerations:
{{ toYaml . | indent 8 }} {{ toYaml . | indent 8 }}
{{- end }} {{- end }}

2
helm/minio/templates/statefulset.yaml
View File

@ -127,7 +127,7 @@ spec:
secretKeyRef: secretKeyRef:
name: {{ template "minio.secretName" . }} name: {{ template "minio.secretName" . }}
key: rootPassword key: rootPassword
{{- if .Values.metrics.podMonitor.public }} {{- if .Values.metrics.serviceMonitor.public }}
- name: MINIO_PROMETHEUS_AUTH_TYPE - name: MINIO_PROMETHEUS_AUTH_TYPE
value: "public" value: "public"
{{- end}} {{- end}}

6
helm/minio/values.yaml
View File

@ -269,6 +269,9 @@ makeUserJob:
resources: resources:
requests: requests:
memory: 128Mi memory: 128Mi
nodeSelector: {}
tolerations: []
affinity: {}
## List of buckets to be created after minio install ## List of buckets to be created after minio install
## ##
@ -300,6 +303,9 @@ makeBucketJob:
resources: resources:
requests: requests:
memory: 128Mi memory: 128Mi
nodeSelector: {}
tolerations: []
affinity: {}
## Use this field to add environment variables relevant to MinIO server. These fields will be passed on to MinIO container(s) ## Use this field to add environment variables relevant to MinIO server. These fields will be passed on to MinIO container(s)
## when Chart is deployed ## when Chart is deployed