diff --git a/chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml b/chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml index 1b99cdbfbe63cbc75957d459ebafe35c71003be6..02d132e3d56f9ef632ab40278da45487a0e79cbb 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 1550e2a8fdccebca363976180ab08bc1a745b6a5..d655d21194ef568c51b17268fa731a56f9b89ca8 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 af322c273b951e1eca26f000cd37ef89ca00e788..4707ae7bf31d83e75955d05c22ff7a93dd29af40 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 6d291791319b8229c8c6c34a25485108bb677e19..849867971dfb523ad7ac5e95dd43615410e5054e 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 f5d3551a78bb123d7d9193776a56f3fda74842e7..e1d5af10a22eacfa0adb00ab681abd7f1162619d 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: {}