From a9cf23677a3c7b0e6f70eae4ee368f081f9d0b5c Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Wed, 9 Dec 2020 01:26:44 +0500 Subject: [PATCH] Remove serviceAccount configuration options --- test/minio/8.0.5/README.md | 2 -- test/minio/8.0.5/templates/_helpers.tpl | 6 +----- .../templates/post-install-prometheus-metrics-role.yaml | 2 -- .../post-install-prometheus-metrics-rolebinding.yaml | 4 +--- .../post-install-prometheus-metrics-serviceaccount.yaml | 2 -- test/minio/8.0.5/templates/serviceaccount.yaml | 2 -- test/minio/8.0.5/values.yaml | 8 -------- 7 files changed, 2 insertions(+), 24 deletions(-) diff --git a/test/minio/8.0.5/README.md b/test/minio/8.0.5/README.md index 7ee74746a0..2589472479 100755 --- a/test/minio/8.0.5/README.md +++ b/test/minio/8.0.5/README.md @@ -147,8 +147,6 @@ The following table lists the configurable parameters of the MinIO chart and the | `service.port` | Kubernetes port where service is exposed | `9000` | | `service.externalIPs` | service external IP addresses | `nil` | | `service.annotations` | Service annotations | `{}` | -| `serviceAccount.create` | Toggle creation of new service account | `true` | -| `serviceAccount.name` | Name of service account to create and/or use | `""` | | `persistence.enabled` | Use persistent volume to store data | `true` | | `persistence.size` | Size of persistent volume claim | `500Gi` | | `persistence.existingClaim` | Use an existing PVC to persist data | `nil` | diff --git a/test/minio/8.0.5/templates/_helpers.tpl b/test/minio/8.0.5/templates/_helpers.tpl index 6f2f5cf4a1..09c4588612 100644 --- a/test/minio/8.0.5/templates/_helpers.tpl +++ b/test/minio/8.0.5/templates/_helpers.tpl @@ -79,11 +79,7 @@ Determine secret name. Determine service account name for deployment or statefulset. */}} {{- define "minio.serviceAccountName" -}} -{{- if .Values.serviceAccount.create -}} -{{- default (include "minio.fullname" .) .Values.serviceAccount.name | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- default "default" .Values.serviceAccount.name -}} -{{- end -}} +{{- (include "minio.fullname" .) | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* diff --git a/test/minio/8.0.5/templates/post-install-prometheus-metrics-role.yaml b/test/minio/8.0.5/templates/post-install-prometheus-metrics-role.yaml index 26c0ce7edc..31de593cc7 100644 --- a/test/minio/8.0.5/templates/post-install-prometheus-metrics-role.yaml +++ b/test/minio/8.0.5/templates/post-install-prometheus-metrics-role.yaml @@ -1,4 +1,3 @@ -{{- if .Values.serviceAccount.create -}} {{- $fullName := include "minio.fullname" . -}} apiVersion: rbac.authorization.k8s.io/v1 kind: Role @@ -35,4 +34,3 @@ rules: - get resourceNames: - {{ $fullName }} -{{- end -}} \ No newline at end of file diff --git a/test/minio/8.0.5/templates/post-install-prometheus-metrics-rolebinding.yaml b/test/minio/8.0.5/templates/post-install-prometheus-metrics-rolebinding.yaml index 7d0ea75b75..442a80bfd3 100644 --- a/test/minio/8.0.5/templates/post-install-prometheus-metrics-rolebinding.yaml +++ b/test/minio/8.0.5/templates/post-install-prometheus-metrics-rolebinding.yaml @@ -1,4 +1,3 @@ -{{- if .Values.serviceAccount.create -}} {{- $fullName := include "minio.fullname" . -}} apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding @@ -16,5 +15,4 @@ roleRef: subjects: - kind: ServiceAccount name: {{ $fullName }}-update-prometheus-secret - namespace: {{ .Release.Namespace | quote }} -{{- end -}} \ No newline at end of file + namespace: {{ .Release.Namespace | quote }} \ No newline at end of file diff --git a/test/minio/8.0.5/templates/post-install-prometheus-metrics-serviceaccount.yaml b/test/minio/8.0.5/templates/post-install-prometheus-metrics-serviceaccount.yaml index 050d368a56..8f9824fe36 100644 --- a/test/minio/8.0.5/templates/post-install-prometheus-metrics-serviceaccount.yaml +++ b/test/minio/8.0.5/templates/post-install-prometheus-metrics-serviceaccount.yaml @@ -1,4 +1,3 @@ -{{- if .Values.serviceAccount.create -}} {{- $fullName := include "minio.fullname" . -}} apiVersion: v1 kind: ServiceAccount @@ -9,4 +8,3 @@ metadata: chart: {{ template "minio.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} -{{- end -}} \ No newline at end of file diff --git a/test/minio/8.0.5/templates/serviceaccount.yaml b/test/minio/8.0.5/templates/serviceaccount.yaml index 243dfef538..2db987867a 100644 --- a/test/minio/8.0.5/templates/serviceaccount.yaml +++ b/test/minio/8.0.5/templates/serviceaccount.yaml @@ -1,4 +1,3 @@ -{{- if .Values.serviceAccount.create -}} apiVersion: v1 kind: ServiceAccount metadata: @@ -8,4 +7,3 @@ metadata: app: {{ template "minio.name" . }} chart: {{ template "minio.chart" . }} release: "{{ .Release.Name }}" -{{- end -}} diff --git a/test/minio/8.0.5/values.yaml b/test/minio/8.0.5/values.yaml index 266137d21a..833a690145 100644 --- a/test/minio/8.0.5/values.yaml +++ b/test/minio/8.0.5/values.yaml @@ -178,11 +178,3 @@ environment: networkPolicy: enabled: false allowExternal: true - -## Specify the service account to use for the Minio pods. If 'create' is set to 'false' -## and 'name' is left unspecified, the account 'default' will be used. -serviceAccount: - create: true - ## The name of the service account to use. If 'create' is 'true', a service account with that name - ## will be created. Otherwise, a name will be auto-generated. - name: