Переглянути джерело

Remove node selector related options

Waqar Ahmed 5 роки тому
батько
коміт
ad300671d8

+ 0 - 5
test/minio/8.0.5/README.md

@@ -166,11 +166,6 @@ The following table lists the configurable parameters of the MinIO chart and the
 | `securityContext.runAsUser`                      | User id of the user for the container                                                                                                   | `1000`                           |
 | `securityContext.runAsGroup`                     | Group id of the user for the container                                                                                                  | `1000`                           |
 | `securityContext.fsGroup`                        | Group id of the persistent volume mount for the container                                                                               | `1000`                           |
-| `nodeSelector`                                   | Node labels for pod assignment                                                                                                          | `{}`                             |
-| `affinity`                                       | Affinity settings for pod assignment                                                                                                    | `{}`                             |
-| `tolerations`                                    | Toleration labels for pod assignment                                                                                                    | `[]`                             |
-| `podAnnotations`                                 | Pod annotations                                                                                                                         | `{}`                             |
-| `podLabels`                                      | Pod Labels                                                                                                                              | `{}`                             |
 | `tls.enabled`                                    | Enable TLS for MinIO server                                                                                                             | `false`                          |
 | `tls.certSecret`                                 | Kubernetes Secret with `public.crt` and `private.key` files.                                                                            | `""`                             |
 | `defaultBucket.enabled`                          | If set to true, a bucket will be created after MinIO install                                                                            | `false`                          |

+ 0 - 18
test/minio/8.0.5/templates/deployment.yaml

@@ -31,15 +31,9 @@ spec:
       labels:
         app: {{ template "minio.name" . }}
         release: {{ .Release.Name }}
-{{- if .Values.podLabels }}
-{{ toYaml .Values.podLabels | indent 8 }}
-{{- end }}
       annotations:
         checksum/secrets: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-{{- if .Values.podAnnotations }}
-{{ toYaml .Values.podAnnotations | trimSuffix "\n" | indent 8 }}
-{{- end }}
     spec:
   {{- if .Values.priorityClassName }}
       priorityClassName: "{{ .Values.priorityClassName }}"
@@ -88,18 +82,6 @@ spec:
             {{- end}}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
-{{- with .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
-{{- end }}
-{{- with .Values.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
-{{- end }}
-{{- with .Values.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
-{{- end }}
       volumes:
         - name: export
         {{- if .Values.persistence.enabled }}

+ 0 - 15
test/minio/8.0.5/templates/post-install-create-bucket-job.yaml

@@ -17,23 +17,8 @@ spec:
       labels:
         app: {{ template "minio.name" . }}-job
         release: {{ .Release.Name }}
-{{- if .Values.podLabels }}
-{{ toYaml .Values.podLabels | indent 8 }}
-{{- end }}
     spec:
       restartPolicy: OnFailure
-{{- if .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 8 }}
-{{- end }}
-{{- with .Values.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
-{{- end }}
-{{- with .Values.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
-{{- end }}
       volumes:
         - name: minio-configuration
           projected:

+ 0 - 18
test/minio/8.0.5/templates/statefulset.yaml

@@ -58,15 +58,9 @@ spec:
       labels:
         app: {{ template "minio.name" . }}
         release: {{ .Release.Name }}
-{{- if .Values.podLabels }}
-{{ toYaml .Values.podLabels | indent 8 }}
-{{- end }}
       annotations:
         checksum/secrets: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-{{- if .Values.podAnnotations }}
-{{ toYaml .Values.podAnnotations | trimSuffix "\n" | indent 8 }}
-{{- end }}
     spec:
       {{- if .Values.priorityClassName }}
       priorityClassName: "{{ .Values.priorityClassName }}"
@@ -125,18 +119,6 @@ spec:
             {{- end}}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
-    {{- with .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
-    {{- end }}
       volumes:
         - name: minio-user
           secret:

+ 0 - 13
test/minio/8.0.5/values.yaml

@@ -149,13 +149,6 @@ service:
     # prometheus.io/path:   '/minio/prometheus/metrics'
     # prometheus.io/port:   '9000'
 
-## Node labels for pod assignment
-## Ref: https://kubernetes.io/docs/user-guide/node-selection/
-##
-nodeSelector: {}
-tolerations: []
-affinity: {}
-
 ## Add stateful containers to have security context, if enabled MinIO will run as this
 ## user and group NOTE: securityContext is only enabled if persistence.enabled=true
 securityContext:
@@ -164,12 +157,6 @@ securityContext:
   runAsGroup: 1000
   fsGroup: 1000
 
-# Additational pod annotations
-podAnnotations: {}
-
-# Additional pod labels
-podLabels: {}
-
 ## Configure resource requests and limits
 ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
 ##