From 7aa968774d1331bab8a8528230588e3175f0e5b2 Mon Sep 17 00:00:00 2001
From: Josh Wolf <josh@joshwolf.dev>
Date: Mon, 1 Mar 2021 09:07:40 -0700
Subject: [PATCH] fix: ensure mattermost-operator (and therefore mattermost)
depend on gatekeeper, monitoring, and istio
---
.../mattermost/mattermost-helmrelease.yaml | 5 -----
.../operator/mattermost-operator-helmrelease.yaml | 12 ++++++++++++
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml b/chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml
index 82dc07bf63..c94b45ade3 100644
--- a/chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml
+++ b/chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml
@@ -100,11 +100,6 @@ spec:
namespace: {{ .Release.Namespace }}
{{- end }}
- {{- if .Values.monitoring.enabled }}
- - name: monitoring
- 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 f479fc830c..39570ff191 100644
--- a/chart/templates/mattermost/operator/mattermost-operator-helmrelease.yaml
+++ b/chart/templates/mattermost/operator/mattermost-operator-helmrelease.yaml
@@ -44,4 +44,16 @@ spec:
values:
imagePullSecrets:
- name: private-registry
+
+ {{- if or .Values.gatekeeper.enabled .Values.monitoring.enabled }}
+ dependsOn:
+ {{- if .Values.gatekeeper.enabled }}
+ - name: gatekeeper
+ namespace: {{ .Release.Namespace }}
+ {{- end }}
+ {{- if .Values.monitoring.enabled }}
+ - name: monitoring
+ namespace: {{ .Release.Namespace }}
+ {{- end }}
+ {{- end }}
{{- end }}
--
GitLab