From 867d938599a1543c734812847b04113f7ae6ebe2 Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Thu, 6 Feb 2025 15:52:43 +0200 Subject: [PATCH 1/2] Revert "removed .Values.eventReporter.enabled condition" This reverts commit 1db47899450d8292381623587e07ce09b626ffab. --- charts/argo-cd/templates/event-reporter/clusterrole.yaml | 2 ++ charts/argo-cd/templates/event-reporter/clusterrolebinding.yaml | 2 ++ 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/prometheusrule.yaml | 2 +- charts/argo-cd/templates/event-reporter/role.yaml | 2 ++ charts/argo-cd/templates/event-reporter/rolebinding.yaml | 2 ++ charts/argo-cd/templates/event-reporter/serviceaccount.yaml | 2 +- charts/argo-cd/templates/event-reporter/servicemonitor.yaml | 2 +- charts/argo-cd/templates/event-reporter/statefulset.yaml | 2 ++ charts/argo-cd/values.yaml | 1 + 12 files changed, 17 insertions(+), 6 deletions(-) diff --git a/charts/argo-cd/templates/event-reporter/clusterrole.yaml b/charts/argo-cd/templates/event-reporter/clusterrole.yaml index 770f75baf..7cfa13636 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 ef5417cda..27a413dec 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 d5e8f6ac6..b18cd29d9 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 eac3a5024..5ea632900 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 8c4ddb3f2..9cc50321a 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 1bf582e37..3b3617bc1 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 b2267cfc8..ee8b87a4d 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 1f35e1387..3e0a5bec6 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 4baa77fee..7f94d89be 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 9fc7421b9..b385f73ab 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 55581e19e..a5b0e8d79 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 b18574795..d0a46f944 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 From 0a88a430c2c2dfec350ae350d8f484d7e64143e5 Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Thu, 6 Feb 2025 16:01:27 +0200 Subject: [PATCH 2/2] updated readme --- charts/argo-cd/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 61329618f..390ab2f1f 100644 --- 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 |