feat: Add Kiali labels for Mattermost/MattermostOperator

chart/templates/mattermost-operator/values.yaml

@@ -11,6 +11,12 @@ imagePullSecrets:
 image:
   imagePullPolicy: {{ .Values.imagePullPolicy }}
 
+{{- if .Values.kiali.enabled }}
+podLabels:
+  {{- include "kialiAppLabel" . | nindent 2 }}
+  {{- include "kialiVersionLabel" . | nindent 2 }}
+{{- end }}
+
 {{- if .Values.istio.enabled }}
 podAnnotations:
   {{ include "istioAnnotation" . }}

chart/templates/mattermost/values.yaml

@@ -12,7 +12,7 @@ openshift: {{ .Values.openshift }}
 
 image:
   imagePullPolicy: {{ .Values.imagePullPolicy }}
-  
+
 {{ $istioInjection := (and .Values.istio.enabled (eq (dig "istio" "injection" "enabled" .Values.addons.mattermost) "enabled")) }}
 
 istio:
@@ -31,6 +31,12 @@ istio:
     kyvernoReporter:
       enabled: {{ .Values.kyvernoReporter.enabled }}
 
+{{- if .Values.kiali.enabled }}
+podLabels:
+  {{- include "kialiAppLabel" . | nindent 2 }}
+  {{- include "kialiVersionLabel" . | nindent 2 }}
+{{- end }}
+
 {{- if $istioInjection }}
 podAnnotations:
   {{ include "istioAnnotation" . }}
@@ -103,6 +109,11 @@ postgresql:
   install: true
   {{- if $istioInjection }}
   primary:
+    {{- if $.Values.kiali.enabled }}
+    podLabels:
+      app: {{ "{{ template \"postgresql.v1.primary.fullname\" . }}" | quote }}
+      {{- include "kialiVersionLabel" $ | nindent 6 }}
+    {{- end }}
     podAnnotations:
       {{ include "istioAnnotation" $ }}
     podSecurityContext:
@@ -125,6 +136,11 @@ postgresql:
           drop:
             - ALL
   readReplicas:
+    {{- if $.Values.kiali.enabled }}
+    podLabels:
+      app: {{ "{{ template \"postgresql.v1.readReplica.fullname\" . }}" | quote }}
+      {{- include "kialiVersionLabel" $ | nindent 6 }}
+    {{- end }}
     podAnnotations:
       {{ include "istioAnnotation" $ }}
   {{- end }}

chart/values.yaml

@@ -594,7 +594,7 @@ elasticsearchKibana:
 
     # -- Elasticsearch/Kibana OIDC client secret
     client_secret: ""
-  
+
   # -- Elasticsearch/Kibana Service Account Annotations
   serviceAccountAnnotations:
     elasticsearch: {}
@@ -712,7 +712,7 @@ loki:
 
   # -- Loki architecture.  Options are monolith and scalable
   strategy: monolith
-  
+
   # -- Loki clusterName identifier for Promtail and Dashboards
   clusterName: ""
 
@@ -1308,7 +1308,7 @@ addons:
       repoName: "registry1"
       chartName: "gitlab-runner"
       tag: "0.66.0-bb.1"
-      
+
 
     # -- Flux reconciliation overrides specifically for the Gitlab Runner Package
     flux: {}
@@ -1648,11 +1648,11 @@ addons:
     git:
       repo: https://repo1.dso.mil/big-bang/product/packages/mattermost.git
       path: "./chart"
-      tag: "9.10.1-bb.3"
+      tag: "9.10.1-bb.4"
     helmRepo:
       repoName: "registry1"
       chartName: "mattermost"
-      tag: "9.10.1-bb.3"
+      tag: "9.10.1-bb.4"
 
     # -- Flux reconciliation overrides specifically for the Mattermost Package
     flux: {}
@@ -1983,7 +1983,7 @@ addons:
 
       # -- OIDC Client Secret to use for Holocron
       client_secret: ""
-      
+
       # -- Holocron SSO group roles: https://repo1.dso.mil/groups/big-bang/apps/sandbox/holocron/-/wikis/Administrator-Guide
       groups:
         admin: ""
@@ -2028,8 +2028,8 @@ addons:
 
       # -- OIDC Client Secret to use for Thanos
       client_secret: ""
-    
-    #Enable S3 Object Storage for Thanos-sidecar https://thanos.io/tip/components/sidecar.md/ and enables Thanos Store Gateway by default https://thanos.io/tip/components/store.md/ 
+
+    #Enable S3 Object Storage for Thanos-sidecar https://thanos.io/tip/components/sidecar.md/ and enables Thanos Store Gateway by default https://thanos.io/tip/components/store.md/
     objectStorage:
       # -- S3 compatible endpoint to use for connection information.
       # examples: "s3.amazonaws.com" "s3.us-gov-west-1.amazonaws.com" "minio.minio.svc.cluster.local:9000"