Merge branch 'minio-servicemonitor-dashboard-not-working' into 'master'

BigBang -- Minio servicemonitor dashboard not working

Closes platform-one/big-bang/apps/application-utilities/minio#24

See merge request platform-one/big-bang/bigbang!1485

chart/templates/mattermost/mattermost/values.yaml

@@ -76,6 +76,9 @@ minio:
   secretKey: {{ .secretKey | default "BigBangDEVONLY" }}
   imagePullSecrets:
     - name: private-registry
+  tenants:
+    metrics:
+      enabled: {{ $.Values.monitoring.enabled }}
 {{- end }}
 {{- end }}
 

chart/templates/minio/minio-operator/values.yaml

@@ -14,6 +14,18 @@ imagePullSecrets:
 operator:
   image:
     pullPolicy: {{ .Values.imagePullPolicy}}
+
+  {{- if .Values.monitoring.enabled }}
+  env:
+    - name: MINIO_OPERATOR_TLS_ENABLE
+      value: "on"
+    - name: CLUSTER_DOMAIN
+      value: "cluster.local"
+    - name: WATCHED_NAMESPACE
+      value: ""
+    - name: PROMETHEUS_NAMESPACE
+      value: "monitoring"
+  {{- end }}    
     
 networkPolicies:
   enabled: {{ .Values.networkPolicies.enabled }}

chart/templates/minio/minio/minio-helmrelease.yaml

@@ -36,4 +36,8 @@ spec:
   dependsOn:
     - name: minio-operator
       namespace: {{ .Release.Namespace }}
+    {{- if .Values.monitoring.enabled }}
+    - name: monitoring
+      namespace: {{ .Release.Namespace }}
+    {{- end }}      
 {{- end }}

chart/templates/minio/minio/values.yaml

@@ -48,6 +48,7 @@ tenants:
   secrets:
     accessKey: {{ .Values.addons.minio.accesskey | default "minio" }}
     secretKey: {{ .Values.addons.minio.secretkey | default "minio123" }}
-
-
+  {{- if .Values.monitoring.enabled }}
+  prometheusOperator: true
+  {{- end }}    
 {{- end -}}

chart/values.yaml

@@ -553,7 +553,7 @@ monitoring:
   git:
     repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/monitoring.git
     path: "./chart"
-    tag: "33.2.0-bb.1"
+    tag: "33.2.0-bb.2"
 
   # -- Flux reconciliation overrides specifically for the Monitoring Package
   flux:
@@ -731,7 +731,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/application-utilities/minio.git
       path: "./chart"
-      tag: "4.4.10-bb.0"
+      tag: "4.4.10-bb.1"
 
     # -- Flux reconciliation overrides specifically for the Minio Package
     flux: {}
@@ -1135,7 +1135,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/collaboration-tools/mattermost.git
       path: "./chart"
-      tag: "0.7.0-bb.0"
+      tag: "0.7.0-bb.1"
 
     # -- Flux reconciliation overrides specifically for the Mattermost Package
     flux: {}