Set required labels for Kiali

CHANGELOG.md

@@ -4,9 +4,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ---
 
+## [9.10.1-bb.4] - 2024-08-13
+
+### Changed
+
+- Update usage of podLabels in mattermost chart
+
 ## [9.10.1-bb.3] - 2024-08-13
 
 ### Added
+
 - Added minio-operator-authz-policy.yaml to allow minio-operator access to monitor the tenant
 
 ## [9.10.1-bb.2] - 2024-08-12

README.md

 <!-- Warning: Do not manually edit this file. See notes on gluon + helm-docs at the end of this file for more information. -->
 # mattermost
 
-![Version: 9.10.1-bb.3](https://img.shields.io/badge/Version-9.10.1--bb.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 9.10.1](https://img.shields.io/badge/AppVersion-9.10.1-informational?style=flat-square)
+![Version: 9.10.1-bb.4](https://img.shields.io/badge/Version-9.10.1--bb.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 9.10.1](https://img.shields.io/badge/AppVersion-9.10.1-informational?style=flat-square)
 
 Deployment of mattermost
 
-## Upstream Release Notes
-
-This package has no upstream release note links on file. Please add some to [chart/Chart.yaml](chart/Chart.yaml) under `annotations.bigbang.dev/upstreamReleaseNotesMarkdown`.
-Example:
-
-```yaml
-annotations:
-  bigbang.dev/upstreamReleaseNotesMarkdown: |
-    - [Find our upstream chart's CHANGELOG here](https://link-goes-here/CHANGELOG.md)
-    - [and our upstream application release notes here](https://another-link-here/RELEASE_NOTES.md)
-```
-
 ## Learn More
 
 * [Application Overview](docs/overview.md)
@@ -55,6 +43,9 @@ helm install mattermost chart/
 | istio.hardened.customServiceEntries | list | `[]` |  |
 | istio.hardened.clusterAuditor.enabled | bool | `false` |  |
 | istio.hardened.clusterAuditor.namespace | string | `"cluster-auditor"` |  |
+| istio.hardened.minioOperator.enabled | bool | `true` |  |
+| istio.hardened.minioOperator.namespaces[0] | string | `"minio-operator"` |  |
+| istio.hardened.minioOperator.principals[0] | string | `"cluster.local/ns/minio-operator/sa/minio-operator"` |  |
 | istio.hardened.monitoring.enabled | bool | `true` |  |
 | istio.hardened.monitoring.namespaces[0] | string | `"monitoring"` |  |
 | istio.hardened.monitoring.principals[0] | string | `"cluster.local/ns/monitoring/sa/monitoring-grafana"` |  |

chart/Chart.yaml

@@ -2,7 +2,7 @@
 apiVersion: v2
 name: mattermost
 type: application
-version: '9.10.1-bb.3'
+version: '9.10.1-bb.4'
 appVersion: 9.10.1
 description: "Deployment of mattermost"
 keywords:
@@ -42,3 +42,5 @@ annotations:
     - name: postgresql
       condition: postgresql.install
       image: registry1.dso.mil/ironbank/opensource/postgres/postgresql:15.7
+    - name: operator-sidecar
+      image: registry1.dso.mil/ironbank/opensource/minio/operator-sidecar:v6.0.2

chart/templates/mattermost.yaml

@@ -115,12 +115,12 @@ spec:
     valueFrom:
       secretKeyRef:
         key: MM_ELASTICSEARCHSETTINGS_INDEXPREFIX
-        name: "mattermost-envs"        
+        name: "mattermost-envs"
   - name: MM_ELASTICSEARCHSETTINGS_BULKINDEXINGTIMEWINDOWSECONDS
     valueFrom:
       secretKeyRef:
         key: MM_ELASTICSEARCHSETTINGS_BULKINDEXINGTIMEWINDOWSECONDS
-        name: "mattermost-envs"        
+        name: "mattermost-envs"
   - name: MM_ELASTICSEARCHSETTINGS_ENABLESEARCHING
     valueFrom:
       secretKeyRef:
@@ -145,7 +145,7 @@ spec:
     valueFrom:
       secretKeyRef:
         key: MM_ELASTICSEARCHSETTINGS_PASSWORD
-        name: "mattermost-envs"             
+        name: "mattermost-envs"
   {{- end }}
   {{- range $k, $v := .Values.mattermostEnvs }}
   - name: {{ $k }}
@@ -177,7 +177,7 @@ spec:
     {{- if .Values.nodeSelector }}
     nodeSelector:
       {{ toYaml .Values.nodeSelector | nindent 6 }}
-    {{- end }}  
+    {{- end }}
 
     {{- if .Values.tolerations}}
     tolerations:
@@ -197,8 +197,8 @@ spec:
   {{- if or .Values.podLabels .Values.podAnnotations .Values.securityContext .Values.containerSecurityContext }}
   podTemplate:
     {{- with .Values.podLabels }}
-    extraLabels: 
-      {{- toYaml . | nindent 6 }}
+    extraLabels:
+      {{- tpl (toYaml .) $ | nindent 6 }}
     {{- end }}
     {{- with .Values.podAnnotations }}
     extraAnnotations:
@@ -209,7 +209,7 @@ spec:
       {{- toYaml . | nindent 6 }}
     {{- end }}
     {{- with .Values.containerSecurityContext }}
-    containerSecurityContext: 
+    containerSecurityContext:
       {{- toYaml . | nindent 6 }}
     {{- end }}
   {{- end }}
@@ -261,10 +261,10 @@ spec:
   updateJob:
     disabled: {{ .Values.updateJob.disabled }}
     {{- with .Values.updateJob.annotations }}
-    extraAnnotations: 
+    extraAnnotations:
       {{- toYaml . | nindent 6 }}
     {{- end }}
     {{- with .Values.updateJob.labels }}
-    extraLabels: 
+    extraLabels:
       {{- toYaml . | nindent 6 }}
     {{- end }}