From 0c60db0dca753e17c04ea435bf5fa27afb2b2ea8 Mon Sep 17 00:00:00 2001 From: Yaroslav Drachenko Date: Tue, 5 Mar 2024 18:25:33 +0200 Subject: [PATCH] Enable event reporter 2.0 by default + return rate limiter (#62) * enable event reporter by default * add comment * update argo-cd image * fix docs * disable reporter in tests * align versions --- charts/argo-cd/Chart.yaml | 8 +++++--- charts/argo-cd/README.md | 4 ++-- charts/argo-cd/ci/default-values.yaml | 5 +++++ charts/argo-cd/ci/extension-values.yaml | 5 +++++ charts/argo-cd/ci/external-redis-values.yaml | 5 +++++ charts/argo-cd/ci/ha-autoscaling-values.yaml | 5 +++++ charts/argo-cd/ci/ha-static-values.yaml | 5 +++++ charts/argo-cd/values.yaml | 4 ++-- 8 files changed, 34 insertions(+), 7 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index a76c2f01..85812af0 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: v2.9-2024.2.29-0f82ce2ec +appVersion: v2.9-2024.3.5-80c3e7225 kubeVersion: ">=1.23.0-0" description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 5.53.12-5-cap-2.9-2024.2.29-0f82ce2ec +version: 5.53.12-6-cap-2.9-2024.3.5-80c3e7225 home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png sources: @@ -27,4 +27,6 @@ annotations: url: https://argoproj.github.io/argo-helm/pgp_keys.asc artifacthub.io/changes: | - kind: changed - description: Upgrade Argo CD to v2.9-2024.2.15-cc783d89f. Getting application version configuration from the Codefresh API. + description: Enable Event Reporter 2.0 by default with 3 replicas. + - kind: changed + description: Change ArgoCD image to 2.9-2024.3.5-80c3e7225 which includes event-reporter rate-limiter. diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 9c912f1e..e332f6f4 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -416,7 +416,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 | `false` | | +| 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 | @@ -478,7 +478,7 @@ NAME: my-release | eventReporter.terminationGracePeriodSeconds | int | `30` | terminationGracePeriodSeconds for container lifecycle hook | | eventReporter.tolerations | list | `[]` (defaults to global.tolerations) | [Tolerations] for use with node taints | | eventReporter.topologySpreadConstraints | list | `[]` (defaults to global.topologySpreadConstraints) | Assign custom [TopologySpreadConstraints] rules to the event reporter | -| eventReporter.version | string | `"v1"` | | +| eventReporter.version | string | `"v2"` | | | eventReporter.volumeMounts | list | `[]` | Additional volumeMounts to the event reporter main container | | eventReporter.volumes | list | `[]` | Additional volumes to the event reporter pod | | extraObjects | list | `[]` | Array of extra K8s manifests to deploy | diff --git a/charts/argo-cd/ci/default-values.yaml b/charts/argo-cd/ci/default-values.yaml index ffc41c8a..607a4825 100644 --- a/charts/argo-cd/ci/default-values.yaml +++ b/charts/argo-cd/ci/default-values.yaml @@ -1,3 +1,8 @@ # Test with default values crds: keep: false + +# these tests only support vanilla argo-cd +# do not work for event reporter component +eventReporter: + enabled: false diff --git a/charts/argo-cd/ci/extension-values.yaml b/charts/argo-cd/ci/extension-values.yaml index 0896ca4c..0ac439d8 100644 --- a/charts/argo-cd/ci/extension-values.yaml +++ b/charts/argo-cd/ci/extension-values.yaml @@ -12,3 +12,8 @@ server: value: https://github.com/argoproj-labs/argocd-extension-metrics/releases/download/v1.0.0/extension.tar.gz - name: EXTENSION_CHECKSUM_URL value: https://github.com/argoproj-labs/argocd-extension-metrics/releases/download/v1.0.0/extension_checksums.txt + +# these tests only support vanilla argo-cd +# do not work for event reporter component +eventReporter: + enabled: false diff --git a/charts/argo-cd/ci/external-redis-values.yaml b/charts/argo-cd/ci/external-redis-values.yaml index 74409b78..ef45271f 100644 --- a/charts/argo-cd/ci/external-redis-values.yaml +++ b/charts/argo-cd/ci/external-redis-values.yaml @@ -10,3 +10,8 @@ redis-ha: externalRedis: host: "redis-master.redis.svc.cluster.local" password: "argocd" + +# these tests only support vanilla argo-cd +# do not work for event reporter component +eventReporter: + enabled: false diff --git a/charts/argo-cd/ci/ha-autoscaling-values.yaml b/charts/argo-cd/ci/ha-autoscaling-values.yaml index 6e994e3f..90719691 100644 --- a/charts/argo-cd/ci/ha-autoscaling-values.yaml +++ b/charts/argo-cd/ci/ha-autoscaling-values.yaml @@ -14,3 +14,8 @@ repoServer: autoscaling: enabled: true minReplicas: 2 + +# these tests only support vanilla argo-cd +# do not work for event reporter component +eventReporter: + enabled: false diff --git a/charts/argo-cd/ci/ha-static-values.yaml b/charts/argo-cd/ci/ha-static-values.yaml index ad5efd35..5071934c 100644 --- a/charts/argo-cd/ci/ha-static-values.yaml +++ b/charts/argo-cd/ci/ha-static-values.yaml @@ -10,3 +10,8 @@ server: repoServer: replicas: 2 + +# these tests only support vanilla argo-cd +# do not work for event reporter component +eventReporter: + enabled: false diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 3b7a4a25..9ff93507 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -3333,11 +3333,11 @@ notifications: eventReporter: # Enabled we need to skip argo-cd chart tests for this component - enabled: false + enabled: true # Version we need to dynamically switch between old and new version # one will be just hanging and the second one working # possible values: v1, v2 - version: v1 + version: v2 name: event-reporter ## Amount of replicas for event reporting sharding replicas: 3