From 542b3ec80afb031182489c3c6e129d8be054a8f5 Mon Sep 17 00:00:00 2001
From: Noah Costello <noah.m.costello@lmco.com>
Date: Thu, 13 Jan 2022 16:42:32 +0000
Subject: [PATCH] Resolve "Annotate Mattermost Operator pods with Istio
version"
---
chart/templates/mattermost/operator/values.yaml | 5 +++++
chart/values.yaml | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/chart/templates/mattermost/operator/values.yaml b/chart/templates/mattermost/operator/values.yaml
index 4d71b00fc2..abc7f1848d 100644
--- a/chart/templates/mattermost/operator/values.yaml
+++ b/chart/templates/mattermost/operator/values.yaml
@@ -9,6 +9,11 @@ imagePullSecrets:
image:
imagePullPolicy: {{ .Values.imagePullPolicy }}
+{{- if .Values.istio.enabled }}
+podAnnotations:
+ {{ include "istioAnnotation" . }}
+{{- end}}
+
networkPolicies:
enabled: {{ .Values.networkPolicies.enabled }}
controlPlaneCidr: {{ .Values.networkPolicies.controlPlaneCidr }}
diff --git a/chart/values.yaml b/chart/values.yaml
index 6c7214b746..e0fa3fd07a 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1009,7 +1009,7 @@ addons:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/collaboration-tools/mattermost-operator.git
path: "./chart"
- tag: "1.17.0-bb.0"
+ tag: "1.17.0-bb.1"
# -- Flux reconciliation overrides specifically for the Mattermost Operator Package
flux: {}
--
GitLab