From 5b094daf61ccb301b4a51fb3abd1c08c24da62f5 Mon Sep 17 00:00:00 2001
From: Charles Culman <chuck.culman@lmco.com>
Date: Tue, 22 Jun 2021 19:59:25 +0000
Subject: [PATCH] Mm upgrade to v5.36.0 take2

---
 CHANGELOG.md                                  |  4 ++++
 chart/Chart.yaml                              |  4 ++--
 .../allow-external-filestore.yaml             | 20 -------------------
 .../allow-external-postgres.yaml              | 19 ------------------
 ...ress.yaml => allow-mattermost-egress.yaml} |  4 ++--
 chart/values.yaml                             |  2 +-
 6 files changed, 9 insertions(+), 44 deletions(-)
 delete mode 100644 chart/templates/bigbang/networkpolicies/allow-external-filestore.yaml
 rename chart/templates/bigbang/networkpolicies/{allow-sso-egress.yaml => allow-mattermost-egress.yaml} (79%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1e9a2f..9041031 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ---
 
+## [0.1.6-bb.6] - 2021-06-22
+### Changed
+- Update Mattermost to version 5.36.0
+
 ## [0.1.6-bb.5] - 2021-06-21
 ### Fixed
 - NetworkPolicy blocking an init container, added policy to allow postgres egress for the init container
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 68c86b6..f6dd4af 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 name: mattermost
 type: application
-version: "0.1.6-bb.5"
-appVersion: "5.34.2"
+version: "0.1.6-bb.6"
+appVersion: "5.36.0"
 description: "Deployment of mattermost"
 keywords:
   - Mattermost
diff --git a/chart/templates/bigbang/networkpolicies/allow-external-filestore.yaml b/chart/templates/bigbang/networkpolicies/allow-external-filestore.yaml
deleted file mode 100644
index 738b7a3..0000000
--- a/chart/templates/bigbang/networkpolicies/allow-external-filestore.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-{{- if and .Values.networkPolicies.enabled (not .Values.minio.install) }}
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  name: allow-external-filestore-egress
-  namespace: {{ .Release.Namespace }}
-spec:
-  podSelector:
-    matchLabels:
-      app: mattermost
-  policyTypes:
-  - Egress
-  egress:
-  - to:
-    - ipBlock:
-        cidr: 0.0.0.0/0
-        # ONLY Block requests to AWS metadata IP
-        except:
-        - 169.254.169.254/32
-{{- end }}
diff --git a/chart/templates/bigbang/networkpolicies/allow-external-postgres.yaml b/chart/templates/bigbang/networkpolicies/allow-external-postgres.yaml
index 1e43c65..265a0e5 100644
--- a/chart/templates/bigbang/networkpolicies/allow-external-postgres.yaml
+++ b/chart/templates/bigbang/networkpolicies/allow-external-postgres.yaml
@@ -1,25 +1,6 @@
 {{- if and .Values.networkPolicies.enabled (not .Values.postgresql.install) }}
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
-metadata:
-  name: allow-external-postgres-egress
-  namespace: {{ .Release.Namespace }}
-spec:
-  podSelector:
-    matchLabels:
-      app: mattermost
-  policyTypes:
-  - Egress
-  egress:
-  - to:
-    - ipBlock:
-        cidr: 0.0.0.0/0
-        # ONLY Block requests to AWS metadata IP
-        except:
-        - 169.254.169.254/32
----
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
 metadata:
   name: allow-external-postgres-egress-upgrade
   namespace: {{ .Release.Namespace }}
diff --git a/chart/templates/bigbang/networkpolicies/allow-sso-egress.yaml b/chart/templates/bigbang/networkpolicies/allow-mattermost-egress.yaml
similarity index 79%
rename from chart/templates/bigbang/networkpolicies/allow-sso-egress.yaml
rename to chart/templates/bigbang/networkpolicies/allow-mattermost-egress.yaml
index 217238b..931746c 100644
--- a/chart/templates/bigbang/networkpolicies/allow-sso-egress.yaml
+++ b/chart/templates/bigbang/networkpolicies/allow-mattermost-egress.yaml
@@ -1,8 +1,8 @@
-{{- if and .Values.networkPolicies.enabled .Values.sso.enabled }}
+{{- if .Values.networkPolicies.enabled }}
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: allow-sso-egress
+  name: allow-mattermost-egress
   namespace: {{ .Release.Namespace }}
 spec:
   podSelector:
diff --git a/chart/values.yaml b/chart/values.yaml
index 418fd1e..636b50a 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -36,7 +36,7 @@ sso:
 # Repo and image tag 
 image:
   name: registry1.dso.mil/ironbank/opensource/mattermost/mattermost
-  tag: 5.34.2
+  tag: 5.36.0
   imagePullPolicy: IfNotPresent
 
 global:
-- 
GitLab