Merge aca49bfadd into de234b888c

cmd/admin-handlers-users.go

@@ -1827,16 +1827,18 @@ func (a adminAPIHandlers) SetPolicyForUserOrGroup(w http.ResponseWriter, r *http
 				iamLogIf(ctx, err)
 			} else if foundGroupDN == nil || !underBaseDN {
 				err = errNoSuchGroup
+			} else {
+				entityName = foundGroupDN.NormDN
 			}
-			entityName = foundGroupDN.NormDN
 		} else {
 			var foundUserDN *xldap.DNSearchResult
 			if foundUserDN, err = globalIAMSys.LDAPConfig.GetValidatedDNForUsername(entityName); err != nil {
 				iamLogIf(ctx, err)
 			} else if foundUserDN == nil {
 				err = errNoSuchUser
+			} else {
+				entityName = foundUserDN.NormDN
 			}
-			entityName = foundUserDN.NormDN
 		}
 		if err != nil {
 			writeErrorResponseJSON(ctx, w, toAdminAPIErr(ctx, err), r.URL)

helm/minio/templates/_helpers.tpl

@@ -92,6 +92,27 @@ Return the appropriate apiVersion for console ingress.
   {{- end -}}
 {{- end -}}
 
+{{/*
+Return the appropriate storageClassName.
+{{ include "minio.persistence.storageClass" ( dict "persistence" .Values.path.to.the.persistence "global" .Values.global) }}
+*/}}
+{{- define "minio.persistence.storageClass" -}}
+  {{- $storageClass := .persistence.storageClass -}}
+  {{- if .global -}}
+      {{- if .global.storageClass -}}
+          {{- $storageClass = .global.storageClass -}}
+      {{- end -}}
+  {{- end -}}
+
+  {{- if $storageClass -}}
+    {{- if (eq "-" $storageClass) -}}
+        {{- printf "storageClassName: \"\"" -}}
+    {{- else }}
+        {{- printf "storageClassName: %s" $storageClass -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
+
 {{/*
 Determine secret name.
 */}}

helm/minio/templates/pvc.yaml

@@ -18,15 +18,9 @@ spec:
   resources:
     requests:
       storage: {{ .Values.persistence.size | quote }}
-  {{- if .Values.persistence.storageClass }}
-  {{- if (eq "-" .Values.persistence.storageClass) }}
-  storageClassName: ""
-  {{- else }}
-  storageClassName: "{{ .Values.persistence.storageClass }}"
-  {{- end }}
-  {{- end }}
   {{- if .Values.persistence.volumeName }}
   volumeName: "{{ .Values.persistence.volumeName }}"
   {{- end }}
+  {{- include "minio.persistence.storageClass" ( dict "persistence" .Values.persistence "global" .Values.global) | nindent 2 }}
 {{- end }}
 {{- end }}

helm/minio/templates/statefulset.yaml

@@ -9,7 +9,6 @@
 {{ $subPath := .Values.persistence.subPath }}
 {{ $penabled := .Values.persistence.enabled }}
 {{ $accessMode := .Values.persistence.accessMode }}
-{{ $storageClass := .Values.persistence.storageClass }}
 {{ $psize := .Values.persistence.size }}
 apiVersion: v1
 kind: Service
@@ -239,12 +238,10 @@ spec:
         {{- end }}
       spec:
         accessModes: [ {{ $accessMode | quote }} ]
-        {{- if $storageClass }}
-        storageClassName: {{ $storageClass }}
-        {{- end }}
         resources:
           requests:
             storage: {{ $psize }}
+        {{- include "minio.persistence.storageClass" ( dict "persistence" $.Values.persistence "global" $.Values.global) | nindent 8 }}
     {{- end }}
     {{- else }}
     - apiVersion: v1
@@ -256,12 +253,10 @@ spec:
         {{- end }}
       spec:
         accessModes: [ {{ $accessMode | quote }} ]
-        {{- if $storageClass }}
-        storageClassName: {{ $storageClass }}
-        {{- end }}
         resources:
           requests:
             storage: {{ $psize }}
+        {{- include "minio.persistence.storageClass" ( dict "persistence" .Values.persistence "global" .Values.global) | nindent 8 }}
     {{- end }}
   {{- end }}
 {{- end }}

helm/minio/values.yaml

@@ -1,3 +1,11 @@
+## Global parameters
+## These will override the parameters, including dependencies, configured to use the global value
+##
+global:
+  ## Global StorageClass for Persistent Volume(s)
+  ##
+  storageClass: ""
+
 ## Provide a name in place of minio for `app:` labels
 ##
 nameOverride: ""