Merge branch 'micah.nagel-master-patch-08203' into 'master'

Enable Istio for MM Operator

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

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

chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml

@@ -42,11 +42,6 @@ spec:
     - name: mattermost-operator
       namespace: {{ .Release.Namespace }}
 
-    {{- if .Values.istio.enabled }}
-    - name: istio
-      namespace: {{ .Release.Namespace }}
-    {{- end }}
-
     {{- with .Values.addons.mattermost.objectStorage }}
     {{- if not (and .endpoint .accessKey .accessSecret .bucket) }}
     - name: minio-operator

chart/templates/mattermost/operator/mattermost-operator-helmrelease.yaml

@@ -37,7 +37,7 @@ spec:
       kind: Secret
       valuesKey: "overlays"
 
-  {{- if or .Values.gatekeeper.enabled .Values.monitoring.enabled }}
+  {{- if or .Values.gatekeeper.enabled .Values.monitoring.enabled .Values.istio.enabled }}
   dependsOn:
     {{- if .Values.gatekeeper.enabled }}
     - name: gatekeeper
@@ -47,5 +47,9 @@ spec:
     - name: monitoring
       namespace: {{ .Release.Namespace }}
     {{- end }}
+    {{- if .Values.istio.enabled }}
+    - name: istio
+      namespace: {{ .Release.Namespace }}
+    {{- end }}
   {{- end }}
 {{- end }}

chart/templates/mattermost/operator/namespace.yaml

@@ -4,7 +4,7 @@ kind: Namespace
 metadata:
   name: mattermost-operator
   labels:
-    istio-injection: disabled
+    istio-injection: enabled
     app.kubernetes.io/name: mattermost-operator
     app.kubernetes.io/component: "collaboration-tools"
     {{- include "commonLabels" . | nindent 4}}

chart/templates/mattermost/operator/values.yaml

@@ -9,4 +9,12 @@ imagePullSecrets:
 networkPolicies:
   enabled: {{ .Values.networkPolicies.enabled }}
   controlPlaneCidr: {{ .Values.networkPolicies.controlPlaneCidr }}
+
+istio:
+  enabled: {{ .Values.istio.enabled }}
+
+monitoring:
+  enabled: {{ .Values.monitoring.enabled }}
+
+openshift: {{ .Values.openshift }}
 {{- end -}}

chart/values.yaml

@@ -915,7 +915,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/collaboration-tools/mattermost-operator.git
       path: "./chart"
-      tag: "1.14.0-bb.4"
+      tag: "1.15.0-bb.0"
 
     # -- Flux reconciliation overrides specifically for the Mattermost Operator Package
     flux: {}