From 493fa4294f9a7b7964a275fb61103250d048017f Mon Sep 17 00:00:00 2001
From: Oleksandr Saulyak <oleksandr.saulyak@octopus.com>
Date: Fri, 16 Aug 2024 07:04:38 +0300
Subject: [PATCH] upd reporter monitoring conditions

---
 charts/argo-cd/templates/event-reporter/metrics.yaml        | 2 +-
 charts/argo-cd/templates/event-reporter/networkpolicy.yaml  | 2 +-
 charts/argo-cd/templates/event-reporter/pdb.yaml            | 2 +-
 charts/argo-cd/templates/event-reporter/serviceaccount.yaml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/charts/argo-cd/templates/event-reporter/metrics.yaml b/charts/argo-cd/templates/event-reporter/metrics.yaml
index 91b35841..d5e8f6ac 100644
--- a/charts/argo-cd/templates/event-reporter/metrics.yaml
+++ b/charts/argo-cd/templates/event-reporter/metrics.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.eventReporter.metrics.enabled }}
+{{- if .Values.eventReporter.metrics.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/charts/argo-cd/templates/event-reporter/networkpolicy.yaml b/charts/argo-cd/templates/event-reporter/networkpolicy.yaml
index f0e027f2..eac3a502 100644
--- a/charts/argo-cd/templates/event-reporter/networkpolicy.yaml
+++ b/charts/argo-cd/templates/event-reporter/networkpolicy.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.global.networkPolicy.create }}
+{{- if .Values.global.networkPolicy.create }}
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
diff --git a/charts/argo-cd/templates/event-reporter/pdb.yaml b/charts/argo-cd/templates/event-reporter/pdb.yaml
index f38e369e..8c4ddb3f 100644
--- a/charts/argo-cd/templates/event-reporter/pdb.yaml
+++ b/charts/argo-cd/templates/event-reporter/pdb.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.eventReporter.pdb.enabled }}
+{{- if .Values.eventReporter.pdb.enabled }}
 apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
diff --git a/charts/argo-cd/templates/event-reporter/serviceaccount.yaml b/charts/argo-cd/templates/event-reporter/serviceaccount.yaml
index ce47707b..4baa77fe 100644
--- a/charts/argo-cd/templates/event-reporter/serviceaccount.yaml
+++ b/charts/argo-cd/templates/event-reporter/serviceaccount.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.eventReporter.serviceAccount.create }}
+{{- if .Values.eventReporter.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
 automountServiceAccountToken: {{ .Values.eventReporter.serviceAccount.automountServiceAccountToken }}