From 2d878ebc8240ace73f78ca998771eefe23e5f206 Mon Sep 17 00:00:00 2001
From: Micah Nagel <micah.nagel@parsons.com>
Date: Thu, 23 Sep 2021 19:21:36 +0000
Subject: [PATCH] Enable Istio for MM Operator
---
.../mattermost/mattermost/mattermost-helmrelease.yaml | 5 -----
.../operator/mattermost-operator-helmrelease.yaml | 6 +++++-
chart/templates/mattermost/operator/namespace.yaml | 2 +-
chart/templates/mattermost/operator/values.yaml | 8 ++++++++
chart/values.yaml | 2 +-
5 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml b/chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml
index 1b99cdbfbe..02d132e3d5 100644
--- a/chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml
+++ b/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
diff --git a/chart/templates/mattermost/operator/mattermost-operator-helmrelease.yaml b/chart/templates/mattermost/operator/mattermost-operator-helmrelease.yaml
index 1550e2a8fd..d655d21194 100644
--- a/chart/templates/mattermost/operator/mattermost-operator-helmrelease.yaml
+++ b/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 }}
diff --git a/chart/templates/mattermost/operator/namespace.yaml b/chart/templates/mattermost/operator/namespace.yaml
index af322c273b..4707ae7bf3 100644
--- a/chart/templates/mattermost/operator/namespace.yaml
+++ b/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}}
diff --git a/chart/templates/mattermost/operator/values.yaml b/chart/templates/mattermost/operator/values.yaml
index 6d29179131..849867971d 100644
--- a/chart/templates/mattermost/operator/values.yaml
+++ b/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 -}}
diff --git a/chart/values.yaml b/chart/values.yaml
index f5d3551a78..e1d5af10a2 100644
--- a/chart/values.yaml
+++ b/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: {}
--
GitLab