Remove serviceAccount configuration options

This commit is contained in:
Waqar Ahmed 2020-12-09 01:26:44 +05:00
parent 80ff32ba58
commit a9cf23677a
7 changed files with 2 additions and 24 deletions

View File

@ -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.port` | Kubernetes port where service is exposed | `9000` |
| `service.externalIPs` | service external IP addresses | `nil` | | `service.externalIPs` | service external IP addresses | `nil` |
| `service.annotations` | Service annotations | `{}` | | `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.enabled` | Use persistent volume to store data | `true` |
| `persistence.size` | Size of persistent volume claim | `500Gi` | | `persistence.size` | Size of persistent volume claim | `500Gi` |
| `persistence.existingClaim` | Use an existing PVC to persist data | `nil` | | `persistence.existingClaim` | Use an existing PVC to persist data | `nil` |

View File

@ -79,11 +79,7 @@ Determine secret name.
Determine service account name for deployment or statefulset. Determine service account name for deployment or statefulset.
*/}} */}}
{{- define "minio.serviceAccountName" -}} {{- define "minio.serviceAccountName" -}}
{{- if .Values.serviceAccount.create -}} {{- (include "minio.fullname" .) | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- default (include "minio.fullname" .) .Values.serviceAccount.name | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- default "default" .Values.serviceAccount.name -}}
{{- end -}}
{{- end -}} {{- end -}}
{{/* {{/*

View File

@ -1,4 +1,3 @@
{{- if .Values.serviceAccount.create -}}
{{- $fullName := include "minio.fullname" . -}} {{- $fullName := include "minio.fullname" . -}}
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: Role kind: Role
@ -35,4 +34,3 @@ rules:
- get - get
resourceNames: resourceNames:
- {{ $fullName }} - {{ $fullName }}
{{- end -}}

View File

@ -1,4 +1,3 @@
{{- if .Values.serviceAccount.create -}}
{{- $fullName := include "minio.fullname" . -}} {{- $fullName := include "minio.fullname" . -}}
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding kind: RoleBinding
@ -16,5 +15,4 @@ roleRef:
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: {{ $fullName }}-update-prometheus-secret name: {{ $fullName }}-update-prometheus-secret
namespace: {{ .Release.Namespace | quote }} namespace: {{ .Release.Namespace | quote }}
{{- end -}}

View File

@ -1,4 +1,3 @@
{{- if .Values.serviceAccount.create -}}
{{- $fullName := include "minio.fullname" . -}} {{- $fullName := include "minio.fullname" . -}}
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
@ -9,4 +8,3 @@ metadata:
chart: {{ template "minio.chart" . }} chart: {{ template "minio.chart" . }}
release: {{ .Release.Name }} release: {{ .Release.Name }}
heritage: {{ .Release.Service }} heritage: {{ .Release.Service }}
{{- end -}}

View File

@ -1,4 +1,3 @@
{{- if .Values.serviceAccount.create -}}
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
@ -8,4 +7,3 @@ metadata:
app: {{ template "minio.name" . }} app: {{ template "minio.name" . }}
chart: {{ template "minio.chart" . }} chart: {{ template "minio.chart" . }}
release: "{{ .Release.Name }}" release: "{{ .Release.Name }}"
{{- end -}}

View File

@ -178,11 +178,3 @@ environment:
networkPolicy: networkPolicy:
enabled: false enabled: false
allowExternal: true 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: