From 92141f1d4f9fab383c400d787382d8fd32e85112 Mon Sep 17 00:00:00 2001
From: Csaky <Tim.Csaky@gov.bc.ca>
Date: Tue, 19 Nov 2024 11:55:00 -0800
Subject: [PATCH] edit pipeline

---
 charts/ches/Chart.yaml                   |  2 +-
 charts/ches/templates/configmap.yaml     |  3 ++-
 charts/ches/templates/networkpolicy.yaml | 12 ++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/charts/ches/Chart.yaml b/charts/ches/Chart.yaml
index fbe37a0..8b78dd6 100644
--- a/charts/ches/Chart.yaml
+++ b/charts/ches/Chart.yaml
@@ -3,7 +3,7 @@ name: common-hosted-email-service
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.0
+version: 1.0.2
 kubeVersion: ">= 1.13.0"
 description: A microservice for managing access control to S3 Objects
 # A chart can be either an 'application' or a 'library' chart.
diff --git a/charts/ches/templates/configmap.yaml b/charts/ches/templates/configmap.yaml
index 4b2d694..65f48ac 100644
--- a/charts/ches/templates/configmap.yaml
+++ b/charts/ches/templates/configmap.yaml
@@ -10,7 +10,8 @@ metadata:
   {{- end }}
 data: {{ toYaml .Values.config.configMap | nindent 2 }}
 {{- end }}
-{{ if eq .Release.Name "master" }}
+# TODO: use release-specific name to avoid conflicts (eg: `{{ .Release.name}}-fluent-bit-config`)
+{{ if eq .Release.Name "xyz" }}
 ---
 apiVersion: v1
 kind: ConfigMap
diff --git a/charts/ches/templates/networkpolicy.yaml b/charts/ches/templates/networkpolicy.yaml
index c715aa0..152938e 100644
--- a/charts/ches/templates/networkpolicy.yaml
+++ b/charts/ches/templates/networkpolicy.yaml
@@ -2,7 +2,7 @@
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: {{ printf "%s-%s" "allow-openshift-ingress-to-ches-app" .Release.Name }}
+  name: {{ printf "%s-%s" "openshift-ingress-to-ches-app" .Release.Name }}
   labels: {{- include "ches.selectorLabels" . | nindent 4 }}
 spec:
   podSelector:
@@ -24,7 +24,7 @@ spec:
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: allow-traffic-from-gateway-to-ches-master
+  name: traffic-from-gateway-to-ches-master
 spec:
   podSelector:
     matchLabels:
@@ -48,7 +48,7 @@ spec:
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: allow-ches-{{ .Release.Name }}-to-postgres-master
+  name: ches-{{ .Release.Name }}-to-postgres-master
   labels: {{- include "ches.selectorLabels" . | nindent 4 }}
 spec:
   podSelector:
@@ -69,7 +69,7 @@ spec:
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: allow-ches-{{ .Release.Name }}-pre-hook-to-postgres-master
+  name: ches-{{ .Release.Name }}-pre-hook-to-postgres-master
   labels: {{- include "ches.selectorLabels" . | nindent 4 }}
 spec:
   podSelector:
@@ -89,7 +89,7 @@ spec:
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: allow-ches-{{ .Release.Name }}-to-redis-master
+  name: ches-{{ .Release.Name }}-to-redis-master
   labels: {{- include "ches.selectorLabels" . | nindent 4 }}
 spec:
   podSelector:
@@ -114,7 +114,7 @@ spec:
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: allow-metabase-b160aa-tools-to-postgres
+  name: metabase-b160aa-tools-to-postgres
 spec:
   podSelector:
     matchLabels: