Merge branch 'mm-istio-inject' into 'master'

Mattermost: Enable Istio Injection

Closes platform-one/big-bang/apps/collaboration-tools/mattermost#37

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

chart/templates/mattermost/mattermost/namespace.yaml

@@ -7,6 +7,6 @@ metadata:
     app.kubernetes.io/name: mattermost
     app.kubernetes.io/component: "collaboration-tools"
     {{- include "commonLabels" . | nindent 4}}
-    istio-injection: disabled
+    istio-injection: {{ dig "istio" "injection" "enabled" .Values.addons.mattermost }}
   name: mattermost
-{{- end }}
\ No newline at end of file
+{{- end }}

chart/templates/mattermost/mattermost/values.yaml

@@ -13,11 +13,21 @@ openshift: {{ .Values.openshift }}
 image:
   imagePullPolicy: {{ .Values.imagePullPolicy }}
   
+{{ $istioInjection := (and .Values.istio.enabled (eq (dig "istio" "injection" "enabled" .Values.addons.mattermost) "enabled")) }}
+
 istio:
   enabled: {{ .Values.istio.enabled }}
   chat:
     gateways:
     - istio-system/{{ default "public" .Values.addons.mattermost.ingress.gateway }}
+  injection: {{ ternary "enabled" "disabled" $istioInjection }}
+
+{{- if $istioInjection }}
+podAnnotations:
+  {{ include "istioAnnotation" . }}
+updateJob:
+  disabled: true
+{{- end }}
 
 monitoring:
   enabled: {{ .Values.monitoring.enabled }}
@@ -54,12 +64,19 @@ enterprise:
 database:
   secret: "mattermost-database-secret"
 {{- else }}
-
 postgresql:
   image:
     pullSecrets:
       - private-registry
   install: true
+  {{- if $istioInjection }}
+  primary:
+    podAnnotations:
+      {{ include "istioAnnotation" $ }}
+  readReplicas:
+    podAnnotations:
+      {{ include "istioAnnotation" $ }}
+  {{- end }}
 {{- end }}
 {{- end }}
 
@@ -79,6 +96,10 @@ minio:
   tenants:
     metrics:
       enabled: {{ $.Values.monitoring.enabled }}
+  {{- if $istioInjection }}
+  annotations:
+    {{ include "istioAnnotation" $ }}
+  {{- end }}
 {{- end }}
 {{- end }}
 

chart/values.yaml

@@ -1276,7 +1276,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/collaboration-tools/mattermost.git
       path: "./chart"
-      tag: "7.5.1-bb.2"
+      tag: "7.5.1-bb.3"
 
     # -- Flux reconciliation overrides specifically for the Mattermost Package
     flux: {}