Merge d1d40f0972 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

@@ -103,6 +103,19 @@ Determine secret name.
   {{- end -}}
 {{- end -}}
 
+{{/*
+Determine domain for hosts
+*/}}
+{{- define "minio.domain" -}}
+  {{- if .Values.global.domain -}}
+    {{- printf ".%s" .Values.global.domain -}}
+  {{- else if .Values.domain -}}
+    {{- printf ".%s" .Values.domain -}}
+  {{- else -}}
+    {{- print "" -}}
+  {{- end -}}
+{{- end -}}
+
 {{/*
 Determine name for scc role and rolebinding
 */}}

helm/minio/templates/console-ingress.yaml

@@ -32,6 +32,7 @@ spec:
     {{- end }}
   {{- end }}
   rules:
+    {{- $domain := include "minio.domain" . -}}
     {{- range .Values.consoleIngress.hosts }}
     - http:
         paths:
@@ -41,7 +42,7 @@ spec:
             backend:
               service:
                 name: {{ $fullName }}
-                port: 
+                port:
                   number: {{ $servicePort }}
             {{- else }}
             backend:
@@ -49,7 +50,9 @@ spec:
               servicePort: {{ $servicePort }}
             {{- end }}
       {{- if . }}
-      host: {{ tpl . $ | quote }}
+        {{- $host := . }}
+        {{- $hostWithDomain := printf "%s%s" $host $domain }}
+        host: {{ $hostWithDomain | quote }}
       {{- end }}
     {{- end }}
 {{- end }}

helm/minio/templates/ingress.yaml

@@ -32,6 +32,7 @@ spec:
     {{- end }}
   {{- end }}
   rules:
+    {{- $domain := include "minio.domain" . -}}
     {{- range .Values.ingress.hosts }}
     - http:
         paths:
@@ -41,7 +42,7 @@ spec:
             backend:
               service:
                 name: {{ $fullName }}
-                port: 
+                port:
                   number: {{ $servicePort }}
             {{- else }}
             backend:
@@ -49,7 +50,9 @@ spec:
               servicePort: {{ $servicePort }}
             {{- end }}
       {{- if . }}
-      host: {{ tpl . $ | quote }}
+        {{- $host := . }}
+        {{- $hostWithDomain := printf "%s%s" $host $domain }}
+        host: {{ $hostWithDomain | quote }}
       {{- end }}
     {{- end }}
 {{- end }}

helm/minio/values.yaml

@@ -625,3 +625,6 @@ etcd:
   corednsPathPrefix: ""
   clientCert: ""
   clientCertKey: ""
+## Provide a domain to append at the end of every host specified in the ingress hosts value
+##
+domain: ''