Merge branch 'master' into 4.4.28-operator-upgrade

chart/templates/minio/minio/values.yaml

@@ -47,7 +47,11 @@ tenant:
     pullPolicy: {{ .Values.imagePullPolicy }}
   imagePullSecret:
     name: private-registry
+  metrics:
+    enabled: {{ .Values.monitoring.enabled }}
   {{- if .Values.monitoring.enabled }}
-  prometheusOperator: true
-  {{- end }}    
+  env:
+    - name: MINIO_PROMETHEUS_AUTH_TYPE
+      value: "public"
+  {{- end }}
 {{- end -}}