Merge branch '54-enable-mtls' into 'master'

Enabling mTLS on mattermost

See merge request !2800

chart/templates/mattermost/values.yaml

@@ -32,6 +32,18 @@ updateJob:
 monitoring:
   enabled: {{ .Values.monitoring.enabled }}
 
+  serviceMonitor:
+    enabled: {{ .Values.monitoring.enabled }}
+    # conditional passes only for default istio: enabled, mTLS: STRICT
+    {{- if and .Values.istio.enabled (eq (dig "istio" "mtls" "mode" "STRICT" .Values.addons.mattermost) "STRICT") }}
+    scheme: https
+    tlsConfig:
+      caFile: /etc/prom-certs/root-cert.pem
+      certFile: /etc/prom-certs/cert-chain.pem
+      keyFile: /etc/prom-certs/key.pem
+      insecureSkipVerify: true  # Prometheus does not support Istio security naming, thus skip verifying target pod certificate
+    {{- end }}
+
 {{- with .Values.addons.mattermost.sso }}
 sso:
   enabled: {{ .enabled }}

chart/values.yaml

@@ -1521,11 +1521,11 @@ addons:
     git:
       repo: https://repo1.dso.mil/big-bang/product/packages/mattermost.git
       path: "./chart"
-      tag: "7.10.0-bb.2"
+      tag: "7.10.0-bb.3"
     helmRepo:
       repoName: "registry1"
       chartName: "mattermost"
-      tag: "7.10.0-bb.2"
+      tag: "7.10.0-bb.3"
 
     # -- Flux reconciliation overrides specifically for the Mattermost Package
     flux: {}