diff --git a/charts/argo-cd/templates/event-reporter/clusterrole.yaml b/charts/argo-cd/templates/event-reporter/clusterrole.yaml index 770f75ba..7cfa1363 100644 --- a/charts/argo-cd/templates/event-reporter/clusterrole.yaml +++ b/charts/argo-cd/templates/event-reporter/clusterrole.yaml @@ -1,3 +1,4 @@ +{{- if .Values.eventReporter.enabled }} {{- $config := .Values.eventReporter.clusterAdminAccess | default dict -}} {{- if hasKey $config "enabled" | ternary $config.enabled .Values.createClusterRoles }} apiVersion: rbac.authorization.k8s.io/v1 @@ -22,3 +23,4 @@ rules: - '*' {{- end }} {{- end }} +{{- end }} diff --git a/charts/argo-cd/templates/event-reporter/clusterrolebinding.yaml b/charts/argo-cd/templates/event-reporter/clusterrolebinding.yaml index ef5417cd..27a413de 100644 --- a/charts/argo-cd/templates/event-reporter/clusterrolebinding.yaml +++ b/charts/argo-cd/templates/event-reporter/clusterrolebinding.yaml @@ -1,3 +1,4 @@ +{{- if .Values.eventReporter.enabled }} {{- $config := .Values.eventReporter.clusterAdminAccess | default dict -}} {{- if hasKey $config "enabled" | ternary $config.enabled .Values.createClusterRoles }} apiVersion: rbac.authorization.k8s.io/v1 @@ -15,3 +16,4 @@ subjects: name: {{ include "argo-cd.eventReporterServiceAccountName" . }} namespace: {{ .Release.Namespace }} {{- end }} +{{- end }} diff --git a/charts/argo-cd/templates/event-reporter/metrics.yaml b/charts/argo-cd/templates/event-reporter/metrics.yaml index d5e8f6ac..b18cd29d 100644 --- a/charts/argo-cd/templates/event-reporter/metrics.yaml +++ b/charts/argo-cd/templates/event-reporter/metrics.yaml @@ -1,4 +1,4 @@ -{{- if .Values.eventReporter.metrics.enabled }} +{{- if and .Values.eventReporter.enabled .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 eac3a502..5ea63290 100644 --- a/charts/argo-cd/templates/event-reporter/networkpolicy.yaml +++ b/charts/argo-cd/templates/event-reporter/networkpolicy.yaml @@ -1,4 +1,4 @@ -{{- if .Values.global.networkPolicy.create }} +{{- if and .Values.eventReporter.enabled .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 8c4ddb3f..9cc50321 100644 --- a/charts/argo-cd/templates/event-reporter/pdb.yaml +++ b/charts/argo-cd/templates/event-reporter/pdb.yaml @@ -1,4 +1,4 @@ -{{- if .Values.eventReporter.pdb.enabled }} +{{- if and .Values.eventReporter.enabled .Values.eventReporter.pdb.enabled }} apiVersion: policy/v1 kind: PodDisruptionBudget metadata: diff --git a/charts/argo-cd/templates/event-reporter/prometheusrule.yaml b/charts/argo-cd/templates/event-reporter/prometheusrule.yaml index 1bf582e3..3b3617bc 100644 --- a/charts/argo-cd/templates/event-reporter/prometheusrule.yaml +++ b/charts/argo-cd/templates/event-reporter/prometheusrule.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.eventReporter.metrics.enabled .Values.eventReporter.metrics.rules.enabled }} +{{- if and .Values.eventReporter.enabled .Values.eventReporter.metrics.enabled .Values.eventReporter.metrics.rules.enabled }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: diff --git a/charts/argo-cd/templates/event-reporter/role.yaml b/charts/argo-cd/templates/event-reporter/role.yaml index b2267cfc..ee8b87a4 100644 --- a/charts/argo-cd/templates/event-reporter/role.yaml +++ b/charts/argo-cd/templates/event-reporter/role.yaml @@ -1,3 +1,4 @@ +{{- if .Values.eventReporter.enabled }} apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -40,3 +41,4 @@ rules: verbs: - create - list +{{- end }} diff --git a/charts/argo-cd/templates/event-reporter/rolebinding.yaml b/charts/argo-cd/templates/event-reporter/rolebinding.yaml index 1f35e138..3e0a5bec 100644 --- a/charts/argo-cd/templates/event-reporter/rolebinding.yaml +++ b/charts/argo-cd/templates/event-reporter/rolebinding.yaml @@ -1,3 +1,4 @@ +{{- if .Values.eventReporter.enabled }} apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: @@ -13,3 +14,4 @@ subjects: - kind: ServiceAccount name: {{ template "argo-cd.eventReporterServiceAccountName" . }} namespace: {{ .Release.Namespace }} +{{- end }} diff --git a/charts/argo-cd/templates/event-reporter/serviceaccount.yaml b/charts/argo-cd/templates/event-reporter/serviceaccount.yaml index 4baa77fe..7f94d89b 100644 --- a/charts/argo-cd/templates/event-reporter/serviceaccount.yaml +++ b/charts/argo-cd/templates/event-reporter/serviceaccount.yaml @@ -1,4 +1,4 @@ -{{- if .Values.eventReporter.serviceAccount.create }} +{{- if and .Values.eventReporter.enabled .Values.eventReporter.serviceAccount.create }} apiVersion: v1 kind: ServiceAccount automountServiceAccountToken: {{ .Values.eventReporter.serviceAccount.automountServiceAccountToken }} diff --git a/charts/argo-cd/templates/event-reporter/servicemonitor.yaml b/charts/argo-cd/templates/event-reporter/servicemonitor.yaml index 9fc7421b..b385f73a 100644 --- a/charts/argo-cd/templates/event-reporter/servicemonitor.yaml +++ b/charts/argo-cd/templates/event-reporter/servicemonitor.yaml @@ -1,4 +1,4 @@ -{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.eventReporter.metrics.enabled .Values.eventReporter.metrics.serviceMonitor.enabled }} +{{- if and .Values.eventReporter.enabled (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.eventReporter.metrics.enabled .Values.eventReporter.metrics.serviceMonitor.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: diff --git a/charts/argo-cd/templates/event-reporter/statefulset.yaml b/charts/argo-cd/templates/event-reporter/statefulset.yaml index 55581e19..a5b0e8d7 100644 --- a/charts/argo-cd/templates/event-reporter/statefulset.yaml +++ b/charts/argo-cd/templates/event-reporter/statefulset.yaml @@ -1,3 +1,4 @@ +{{- if .Values.eventReporter.enabled }} apiVersion: apps/v1 kind: StatefulSet metadata: @@ -322,3 +323,4 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} dnsPolicy: {{ .Values.eventReporter.dnsPolicy }} +{{- end }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index b1857479..d0a46f94 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -3755,6 +3755,7 @@ notifications: eventReporter: name: event-reporter + enabled: true ## Amount of replicas for event reporting sharding replicas: 3 ## Event reporter Pod Disruption Budget