feat: allow disabling event reporter

ATGardner · web-flow · commit 6c4bfbf146a3 · 2025-02-10T23:59:33.000+02:00
diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md
@@ -727,6 +727,7 @@ NAME: my-release
 | eventReporter.containerSecurityContext | object | See [values.yaml] | Event reporter container-level security context |
 | eventReporter.dnsConfig | object | `{}` | [DNS configuration] |
 | eventReporter.dnsPolicy | string | `"ClusterFirst"` | Alternative DNS policy for event reporter pods |
+| eventReporter.enabled | bool | `true` |  |
 | eventReporter.env | list | `[]` | Environment variables to pass to event reporter |
 | eventReporter.envFrom | list | `[]` (See [values.yaml]) | envFrom to pass to event reporter |
 | eventReporter.extraArgs | list | `[]` | Additional command line arguments to pass to event reporter |
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{{- if .Values.eventReporter.metrics.enabled }}`
	`1`	`+{{- if and .Values.eventReporter.enabled .Values.eventReporter.metrics.enabled }}`
`2`	`2`	`apiVersion: v1`
`3`	`3`	`kind: Service`
`4`	`4`	`metadata:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{{- if .Values.global.networkPolicy.create }}`
	`1`	`+{{- if and .Values.eventReporter.enabled .Values.global.networkPolicy.create }}`
`2`	`2`	`apiVersion: networking.k8s.io/v1`
`3`	`3`	`kind: NetworkPolicy`
`4`	`4`	`metadata:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{{- if .Values.eventReporter.pdb.enabled }}`
	`1`	`+{{- if and .Values.eventReporter.enabled .Values.eventReporter.pdb.enabled }}`
`2`	`2`	`apiVersion: policy/v1`
`3`	`3`	`kind: PodDisruptionBudget`
`4`	`4`	`metadata:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{{- if and .Values.eventReporter.metrics.enabled .Values.eventReporter.metrics.rules.enabled }}`
	`1`	`+{{- if and .Values.eventReporter.enabled .Values.eventReporter.metrics.enabled .Values.eventReporter.metrics.rules.enabled }}`
`2`	`2`	`apiVersion: monitoring.coreos.com/v1`
`3`	`3`	`kind: PrometheusRule`
`4`	`4`	`metadata:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{{- if .Values.eventReporter.serviceAccount.create }}`
	`1`	`+{{- if and .Values.eventReporter.enabled .Values.eventReporter.serviceAccount.create }}`
`2`	`2`	`apiVersion: v1`
`3`	`3`	`kind: ServiceAccount`
`4`	`4`	`automountServiceAccountToken: {{ .Values.eventReporter.serviceAccount.automountServiceAccountToken }}`