From 96e4cabcc2da8b1e81289bb8967ba44ca91df09e Mon Sep 17 00:00:00 2001 From: oleksandr-codefresh Date: Wed, 30 Apr 2025 14:29:34 +0300 Subject: [PATCH 1/9] event-reporter from extras as default one --- charts/gitops-runtime/README.md | 9 ++--- .../templates/event-reporter.yaml | 36 +++++++++---------- charts/gitops-runtime/values.yaml | 10 ------ 3 files changed, 21 insertions(+), 34 deletions(-) diff --git a/charts/gitops-runtime/README.md b/charts/gitops-runtime/README.md index 49a3a1f5..621ebc19 100644 --- a/charts/gitops-runtime/README.md +++ b/charts/gitops-runtime/README.md @@ -191,14 +191,14 @@ sealed-secrets: | app-proxy.image-enrichment.serviceAccount.name | string | `"codefresh-image-enrichment-sa"` | Name of the service account to create or the name of the existing one to use | | app-proxy.image.pullPolicy | string | `"IfNotPresent"` | | | app-proxy.image.repository | string | `"quay.io/codefresh/cap-app-proxy"` | | -| app-proxy.image.tag | string | `"1.3389.0"` | | +| app-proxy.image.tag | string | `"1.3451.0"` | | | app-proxy.imagePullSecrets | list | `[]` | | | app-proxy.initContainer.command[0] | string | `"./init.sh"` | | | app-proxy.initContainer.env | object | `{}` | | | app-proxy.initContainer.extraVolumeMounts | list | `[]` | Extra volume mounts for init container | | app-proxy.initContainer.image.pullPolicy | string | `"IfNotPresent"` | | | app-proxy.initContainer.image.repository | string | `"quay.io/codefresh/cap-app-proxy-init"` | | -| app-proxy.initContainer.image.tag | string | `"1.3389.0"` | | +| app-proxy.initContainer.image.tag | string | `"1.3451.0"` | | | app-proxy.initContainer.resources.limits | object | `{}` | | | app-proxy.initContainer.resources.requests.cpu | string | `"0.2"` | | | app-proxy.initContainer.resources.requests.memory | string | `"256Mi"` | | @@ -244,9 +244,6 @@ sealed-secrets: | argo-cd.configs.params."server.insecure" | bool | `true` | | | argo-cd.crds.install | bool | `true` | | | argo-cd.enabled | bool | `true` | | -| argo-cd.eventReporter.enabled | bool | `true` | Installs new event reporter component to cluster | -| argo-cd.eventReporter.replicas | int | `3` | Amount of shards to handle applications events | -| argo-cd.eventReporter.version | string | `"v2"` | Switches between old and new reporter version. Possible values: v1, v2. For v2 `argo-cd.eventReporter.enabled=true` is required | | argo-cd.fullnameOverride | string | `"argo-cd"` | | | argo-events.configs.jetstream.versions[0].configReloaderImage | string | `"natsio/nats-server-config-reloader:0.16.0"` | | | argo-events.configs.jetstream.versions[0].metricsExporterImage | string | `"natsio/prometheus-nats-exporter:0.15.0"` | | @@ -327,7 +324,7 @@ sealed-secrets: | gitops-operator.crds.install | bool | `true` | Whether or not to install CRDs | | gitops-operator.crds.keep | bool | `false` | Keep CRDs if gitops runtime release is uninstalled | | gitops-operator.enabled | bool | `true` | | -| gitops-operator.env | object | `{}` | | +| gitops-operator.env.TASK_PULLING_INTERVAL | string | `"10s"` | | | gitops-operator.fullnameOverride | string | `""` | | | gitops-operator.image | object | `{}` | | | gitops-operator.imagePullSecrets | list | `[]` | | diff --git a/charts/gitops-runtime/templates/event-reporter.yaml b/charts/gitops-runtime/templates/event-reporter.yaml index 627adf17..0ac6b452 100644 --- a/charts/gitops-runtime/templates/event-reporter.yaml +++ b/charts/gitops-runtime/templates/event-reporter.yaml @@ -1,23 +1,23 @@ -{{- if not (index .Values "argo-cd" "enabled") }} - {{- $cfArgoCdExtrasContext := (index .Subcharts "cf-argocd-extras")}} +{{- $cfArgoCdExtrasContext := (index .Subcharts "cf-argocd-extras")}} + {{- if not (index .Values "argo-cd" "enabled") }} - {{- $_ := set (index $cfArgoCdExtrasContext.Values.eventReporter.configMaps "cmd-params-cm" "data") "argocd.server" (include "codefresh-gitops-runtime.argocd.server.no-protocol-url" . ) }} - {{- $_ := set (index $cfArgoCdExtrasContext.Values.eventReporter.configMaps "cmd-params-cm" "data") "redis.server" (include "codefresh-gitops-runtime.argocd.redis.url" . ) }} - {{- $_ := set (index $cfArgoCdExtrasContext.Values.eventReporter.configMaps "cmd-params-cm" "data") "repo.server" (include "codefresh-gitops-runtime.argocd.reposerver.url" . ) }} + {{- $_ := set (index $cfArgoCdExtrasContext.Values.eventReporter.configMaps "cmd-params-cm" "data") "argocd.server" (include "codefresh-gitops-runtime.argocd.server.no-protocol-url" . ) }} + {{- $_ := set (index $cfArgoCdExtrasContext.Values.eventReporter.configMaps "cmd-params-cm" "data") "redis.server" (include "codefresh-gitops-runtime.argocd.redis.url" . ) }} + {{- $_ := set (index $cfArgoCdExtrasContext.Values.eventReporter.configMaps "cmd-params-cm" "data") "repo.server" (include "codefresh-gitops-runtime.argocd.reposerver.url" . ) }} - {{- if and (eq (index .Values "global" "external-argo-cd" "auth" "type") "token") }} - {{- if not (index .Values "global" "external-argo-cd" "auth" "token") }} - {{- $_ := set $cfArgoCdExtrasContext.Values.eventReporter.container.env "ARGO_CD_TOKEN_SECRET_NAME" (required ".Values.global.external-argo-cd.auth.type is set to 'token' therefore .Values.global.external-argo-cd.auth.tokenSecretKeyRef.name is required" (index .Values "global" "external-argo-cd" "auth" "tokenSecretKeyRef" "name")) }} - {{- $_ := set $cfArgoCdExtrasContext.Values.eventReporter.container.env "ARGO_CD_TOKEN_SECRET_KEY" (required ".Values.global.external-argo-cd.auth.type is set to 'token' therefore .Values.global.external-argo-cd.auth.tokenSecretKeyRef.key is required" (index .Values "global" "external-argo-cd" "auth" "tokenSecretKeyRef" "key" )) }} - {{- else }} - {{- $_ := set $cfArgoCdExtrasContext.Values.eventReporter.container.env "ARGO_CD_TOKEN_SECRET_NAME" "gitops-runtime-argo-cd-token" }} - {{- $_ := set $cfArgoCdExtrasContext.Values.eventReporter.container.env "ARGO_CD_TOKEN_SECRET_KEY" "token" }} + {{- if and (eq (index .Values "global" "external-argo-cd" "auth" "type") "token") }} + {{- if not (index .Values "global" "external-argo-cd" "auth" "token") }} + {{- $_ := set $cfArgoCdExtrasContext.Values.eventReporter.container.env "ARGO_CD_TOKEN_SECRET_NAME" (required ".Values.global.external-argo-cd.auth.type is set to 'token' therefore .Values.global.external-argo-cd.auth.tokenSecretKeyRef.name is required" (index .Values "global" "external-argo-cd" "auth" "tokenSecretKeyRef" "name")) }} + {{- $_ := set $cfArgoCdExtrasContext.Values.eventReporter.container.env "ARGO_CD_TOKEN_SECRET_KEY" (required ".Values.global.external-argo-cd.auth.type is set to 'token' therefore .Values.global.external-argo-cd.auth.tokenSecretKeyRef.key is required" (index .Values "global" "external-argo-cd" "auth" "tokenSecretKeyRef" "key" )) }} + {{- else }} + {{- $_ := set $cfArgoCdExtrasContext.Values.eventReporter.container.env "ARGO_CD_TOKEN_SECRET_NAME" "gitops-runtime-argo-cd-token" }} + {{- $_ := set $cfArgoCdExtrasContext.Values.eventReporter.container.env "ARGO_CD_TOKEN_SECRET_KEY" "token" }} + {{- end }} {{- end }} - {{- end }} - {{- if and (index .Values "global" "external-argo-cd" "server" "rootpath") }} - {{- $_ := set $cfArgoCdExtrasContext.Values.eventReporter.container.env "ARGOCD_SERVER_ROOTPATH" (index .Values "global" "external-argo-cd" "server" "rootpath") }} - {{- end }} + {{- if and (index .Values "global" "external-argo-cd" "server" "rootpath") }} + {{- $_ := set $cfArgoCdExtrasContext.Values.eventReporter.container.env "ARGOCD_SERVER_ROOTPATH" (index .Values "global" "external-argo-cd" "server" "rootpath") }} + {{- end }} - {{- include "cf-argocd-extras.event-reporter.resources" $cfArgoCdExtrasContext }} -{{- end }} + {{- end }} +{{ include "cf-argocd-extras.event-reporter.resources" $cfArgoCdExtrasContext }} \ No newline at end of file diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index 8181f6c5..505405f7 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -242,16 +242,6 @@ argo-cd: server.insecure: true application.namespaces: 'cf-*' - eventReporter: - # -- Installs new event reporter component to cluster - enabled: true - # -- Amount of shards to handle applications events - replicas: 3 - # -- Switches between old and new reporter version. - # Possible values: v1, v2. - # For v2 `argo-cd.eventReporter.enabled=true` is required - version: v2 - applicationVersioning: # -- Enable application versioning enabled: true From 1f35d4c7e5ccc195e0ecdd7b48f901c19c083c0e Mon Sep 17 00:00:00 2001 From: oleksandr-codefresh Date: Wed, 30 Apr 2025 14:44:00 +0300 Subject: [PATCH 2/9] removed values for event-reporter enabling in extras --- charts/gitops-runtime/Chart.yaml | 2 +- charts/gitops-runtime/values.yaml | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/charts/gitops-runtime/Chart.yaml b/charts/gitops-runtime/Chart.yaml index deb4adc2..2b1ad33a 100644 --- a/charts/gitops-runtime/Chart.yaml +++ b/charts/gitops-runtime/Chart.yaml @@ -15,7 +15,7 @@ annotations: artifacthub.io/alternativeName: "codefresh-gitops-runtime" dependencies: - name: argo-cd - repository: https://codefresh-io.github.io/argo-helm + repository: https://codefresh-io.github.io/argo-helm/dev condition: argo-cd.enabled version: 7.8.23-2-cap-v2.14.9-2025-04-23-4de04dd8 - name: argo-events diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index 505405f7..1031a022 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -729,6 +729,3 @@ garage-workflows-artifact-storage: cf-argocd-extras: # -- Library mode for the chart. Allows to inject values from gitops runtime chart libraryMode: true - # -- Event reporter configuration - eventReporter: - enabled: true From 50109d6411a007aa134abaec8c25f806dbb18b33 Mon Sep 17 00:00:00 2001 From: oleksandr-codefresh Date: Wed, 30 Apr 2025 15:28:03 +0300 Subject: [PATCH 3/9] dev argocd-extras --- charts/gitops-runtime/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/gitops-runtime/Chart.yaml b/charts/gitops-runtime/Chart.yaml index 2b1ad33a..ab3ca7ae 100644 --- a/charts/gitops-runtime/Chart.yaml +++ b/charts/gitops-runtime/Chart.yaml @@ -48,5 +48,5 @@ dependencies: version: 0.5.0-cf.3 condition: garage-workflows-artifact-storage.enabled - name: cf-argocd-extras - repository: oci://quay.io/codefresh/charts - version: 0.3.17 + repository: oci://quay.io/codefresh/charts/dev + version: 0.3.19-cr-28096-event-reporter-always-enabled-4ac1710 From 07c65c52a2de216dc8e35238f550cd68ce25466b Mon Sep 17 00:00:00 2001 From: oleksandr-codefresh Date: Wed, 30 Apr 2025 17:33:11 +0300 Subject: [PATCH 4/9] dev argocd --- charts/gitops-runtime/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gitops-runtime/Chart.yaml b/charts/gitops-runtime/Chart.yaml index ab3ca7ae..3495e0db 100644 --- a/charts/gitops-runtime/Chart.yaml +++ b/charts/gitops-runtime/Chart.yaml @@ -15,7 +15,7 @@ annotations: artifacthub.io/alternativeName: "codefresh-gitops-runtime" dependencies: - name: argo-cd - repository: https://codefresh-io.github.io/argo-helm/dev + repository: oci://quay.io/codefresh/charts/dev condition: argo-cd.enabled version: 7.8.23-2-cap-v2.14.9-2025-04-23-4de04dd8 - name: argo-events From 4df1d143d0b38b78a7b7fce12ce8d4bea18ee7c8 Mon Sep 17 00:00:00 2001 From: oleksandr-codefresh Date: Fri, 2 May 2025 13:51:19 +0300 Subject: [PATCH 5/9] removal of v1 reporter --- charts/gitops-runtime/Chart.yaml | 10 +++--- .../templates/event-reporter.yaml | 32 +++++++++---------- .../tests/v2-event-reporter_test.yaml | 29 +++++++++++++++++ 3 files changed, 50 insertions(+), 21 deletions(-) create mode 100644 charts/gitops-runtime/tests/v2-event-reporter_test.yaml diff --git a/charts/gitops-runtime/Chart.yaml b/charts/gitops-runtime/Chart.yaml index 3495e0db..472661b5 100644 --- a/charts/gitops-runtime/Chart.yaml +++ b/charts/gitops-runtime/Chart.yaml @@ -42,11 +42,11 @@ dependencies: version: 0.5.4 alias: gitops-operator condition: gitops-operator.enabled -- name: garage - repository: https://codefresh-io.github.io/garage - alias: garage-workflows-artifact-storage - version: 0.5.0-cf.3 - condition: garage-workflows-artifact-storage.enabled +#- name: garage +# repository: https://codefresh-io.github.io/garage +# alias: garage-workflows-artifact-storage +# version: 0.5.0-cf.3 +# condition: garage-workflows-artifact-storage.enabled - name: cf-argocd-extras repository: oci://quay.io/codefresh/charts/dev version: 0.3.19-cr-28096-event-reporter-always-enabled-4ac1710 diff --git a/charts/gitops-runtime/templates/event-reporter.yaml b/charts/gitops-runtime/templates/event-reporter.yaml index 0ac6b452..2242e8fb 100644 --- a/charts/gitops-runtime/templates/event-reporter.yaml +++ b/charts/gitops-runtime/templates/event-reporter.yaml @@ -1,23 +1,23 @@ {{- $cfArgoCdExtrasContext := (index .Subcharts "cf-argocd-extras")}} - {{- if not (index .Values "argo-cd" "enabled") }} +{{- if not (index .Values "argo-cd" "enabled") }} - {{- $_ := set (index $cfArgoCdExtrasContext.Values.eventReporter.configMaps "cmd-params-cm" "data") "argocd.server" (include "codefresh-gitops-runtime.argocd.server.no-protocol-url" . ) }} - {{- $_ := set (index $cfArgoCdExtrasContext.Values.eventReporter.configMaps "cmd-params-cm" "data") "redis.server" (include "codefresh-gitops-runtime.argocd.redis.url" . ) }} - {{- $_ := set (index $cfArgoCdExtrasContext.Values.eventReporter.configMaps "cmd-params-cm" "data") "repo.server" (include "codefresh-gitops-runtime.argocd.reposerver.url" . ) }} + {{- $_ := set (index $cfArgoCdExtrasContext.Values.eventReporter.configMaps "cmd-params-cm" "data") "argocd.server" (include "codefresh-gitops-runtime.argocd.server.no-protocol-url" . ) }} + {{- $_ := set (index $cfArgoCdExtrasContext.Values.eventReporter.configMaps "cmd-params-cm" "data") "redis.server" (include "codefresh-gitops-runtime.argocd.redis.url" . ) }} + {{- $_ := set (index $cfArgoCdExtrasContext.Values.eventReporter.configMaps "cmd-params-cm" "data") "repo.server" (include "codefresh-gitops-runtime.argocd.reposerver.url" . ) }} - {{- if and (eq (index .Values "global" "external-argo-cd" "auth" "type") "token") }} - {{- if not (index .Values "global" "external-argo-cd" "auth" "token") }} - {{- $_ := set $cfArgoCdExtrasContext.Values.eventReporter.container.env "ARGO_CD_TOKEN_SECRET_NAME" (required ".Values.global.external-argo-cd.auth.type is set to 'token' therefore .Values.global.external-argo-cd.auth.tokenSecretKeyRef.name is required" (index .Values "global" "external-argo-cd" "auth" "tokenSecretKeyRef" "name")) }} - {{- $_ := set $cfArgoCdExtrasContext.Values.eventReporter.container.env "ARGO_CD_TOKEN_SECRET_KEY" (required ".Values.global.external-argo-cd.auth.type is set to 'token' therefore .Values.global.external-argo-cd.auth.tokenSecretKeyRef.key is required" (index .Values "global" "external-argo-cd" "auth" "tokenSecretKeyRef" "key" )) }} - {{- else }} - {{- $_ := set $cfArgoCdExtrasContext.Values.eventReporter.container.env "ARGO_CD_TOKEN_SECRET_NAME" "gitops-runtime-argo-cd-token" }} - {{- $_ := set $cfArgoCdExtrasContext.Values.eventReporter.container.env "ARGO_CD_TOKEN_SECRET_KEY" "token" }} - {{- end }} - {{- end }} - - {{- if and (index .Values "global" "external-argo-cd" "server" "rootpath") }} - {{- $_ := set $cfArgoCdExtrasContext.Values.eventReporter.container.env "ARGOCD_SERVER_ROOTPATH" (index .Values "global" "external-argo-cd" "server" "rootpath") }} + {{- if and (eq (index .Values "global" "external-argo-cd" "auth" "type") "token") }} + {{- if not (index .Values "global" "external-argo-cd" "auth" "token") }} + {{- $_ := set $cfArgoCdExtrasContext.Values.eventReporter.container.env "ARGO_CD_TOKEN_SECRET_NAME" (required ".Values.global.external-argo-cd.auth.type is set to 'token' therefore .Values.global.external-argo-cd.auth.tokenSecretKeyRef.name is required" (index .Values "global" "external-argo-cd" "auth" "tokenSecretKeyRef" "name")) }} + {{- $_ := set $cfArgoCdExtrasContext.Values.eventReporter.container.env "ARGO_CD_TOKEN_SECRET_KEY" (required ".Values.global.external-argo-cd.auth.type is set to 'token' therefore .Values.global.external-argo-cd.auth.tokenSecretKeyRef.key is required" (index .Values "global" "external-argo-cd" "auth" "tokenSecretKeyRef" "key" )) }} + {{- else }} + {{- $_ := set $cfArgoCdExtrasContext.Values.eventReporter.container.env "ARGO_CD_TOKEN_SECRET_NAME" "gitops-runtime-argo-cd-token" }} + {{- $_ := set $cfArgoCdExtrasContext.Values.eventReporter.container.env "ARGO_CD_TOKEN_SECRET_KEY" "token" }} {{- end }} + {{- end }} + {{- if and (index .Values "global" "external-argo-cd" "server" "rootpath") }} + {{- $_ := set $cfArgoCdExtrasContext.Values.eventReporter.container.env "ARGOCD_SERVER_ROOTPATH" (index .Values "global" "external-argo-cd" "server" "rootpath") }} {{- end }} + +{{- end }} {{ include "cf-argocd-extras.event-reporter.resources" $cfArgoCdExtrasContext }} \ No newline at end of file diff --git a/charts/gitops-runtime/tests/v2-event-reporter_test.yaml b/charts/gitops-runtime/tests/v2-event-reporter_test.yaml new file mode 100644 index 00000000..85b3f1b1 --- /dev/null +++ b/charts/gitops-runtime/tests/v2-event-reporter_test.yaml @@ -0,0 +1,29 @@ +suite: cf-argocd-extras tests +templates: + - sources-server.yaml + - event-reporter.yaml + - charts/cf-argocd-extras/* +tests: + - it: New Event-Reporter should be deployed with forked ArgoCD + template: event-reporter.yaml + values: + - ./values/mandatory-values-ingress.yaml + asserts: + - containsDocument: + kind: StatefulSet + apiVersion: apps/v1 + name: event-reporter + +# - it: New Event-Reporter should be deployed with external OSS ArgoCD +# template: event-reporter.yaml +# documentSelector: +# path: kind +# value: StatefulSet +# values: +# - ./values/mandatory-values-ingress.yaml +# - ./values/external-argocd-values.yaml +# asserts: +# - containsDocument: +# kind: StatefulSet +# apiVersion: apps/v1 +# name: event-reporter From a8e873051710f61485b13c6a0b5ae5b3bcf1a755 Mon Sep 17 00:00:00 2001 From: oleksandr-codefresh Date: Fri, 2 May 2025 14:04:04 +0300 Subject: [PATCH 6/9] uncomment garage --- charts/gitops-runtime/Chart.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/gitops-runtime/Chart.yaml b/charts/gitops-runtime/Chart.yaml index 472661b5..3495e0db 100644 --- a/charts/gitops-runtime/Chart.yaml +++ b/charts/gitops-runtime/Chart.yaml @@ -42,11 +42,11 @@ dependencies: version: 0.5.4 alias: gitops-operator condition: gitops-operator.enabled -#- name: garage -# repository: https://codefresh-io.github.io/garage -# alias: garage-workflows-artifact-storage -# version: 0.5.0-cf.3 -# condition: garage-workflows-artifact-storage.enabled +- name: garage + repository: https://codefresh-io.github.io/garage + alias: garage-workflows-artifact-storage + version: 0.5.0-cf.3 + condition: garage-workflows-artifact-storage.enabled - name: cf-argocd-extras repository: oci://quay.io/codefresh/charts/dev version: 0.3.19-cr-28096-event-reporter-always-enabled-4ac1710 From 6de5d0b5f0101a5dd1d6f856a5c308076a437880 Mon Sep 17 00:00:00 2001 From: oleksandr-codefresh Date: Mon, 5 May 2025 12:13:35 +0300 Subject: [PATCH 7/9] prod versions of charts and unittests for v2 event-reporter --- charts/gitops-runtime/Chart.yaml | 8 ++--- .../tests/cf-argocd-extras_test.yaml | 17 +++++++++-- .../tests/forked-argocd_test.yaml | 25 ++++++++++++++++ .../tests/v2-event-reporter_test.yaml | 29 ------------------- 4 files changed, 44 insertions(+), 35 deletions(-) create mode 100644 charts/gitops-runtime/tests/forked-argocd_test.yaml delete mode 100644 charts/gitops-runtime/tests/v2-event-reporter_test.yaml diff --git a/charts/gitops-runtime/Chart.yaml b/charts/gitops-runtime/Chart.yaml index 3495e0db..d64c094f 100644 --- a/charts/gitops-runtime/Chart.yaml +++ b/charts/gitops-runtime/Chart.yaml @@ -15,9 +15,9 @@ annotations: artifacthub.io/alternativeName: "codefresh-gitops-runtime" dependencies: - name: argo-cd - repository: oci://quay.io/codefresh/charts/dev + repository: https://codefresh-io.github.io/argo-helm condition: argo-cd.enabled - version: 7.8.23-2-cap-v2.14.9-2025-04-23-4de04dd8 + version: 7.8.23-3-cap-v2.14.9-2025-04-23-4de04dd8 - name: argo-events repository: https://codefresh-io.github.io/argo-helm version: 2.4.7-1-cap-CR-28072 @@ -48,5 +48,5 @@ dependencies: version: 0.5.0-cf.3 condition: garage-workflows-artifact-storage.enabled - name: cf-argocd-extras - repository: oci://quay.io/codefresh/charts/dev - version: 0.3.19-cr-28096-event-reporter-always-enabled-4ac1710 + repository: oci://quay.io/codefresh/charts + version: 0.3.19 diff --git a/charts/gitops-runtime/tests/cf-argocd-extras_test.yaml b/charts/gitops-runtime/tests/cf-argocd-extras_test.yaml index 80979628..f684e0d0 100644 --- a/charts/gitops-runtime/tests/cf-argocd-extras_test.yaml +++ b/charts/gitops-runtime/tests/cf-argocd-extras_test.yaml @@ -58,7 +58,7 @@ tests: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/component: sources-server - - it: New Event-Reporter should NOT be deployed with forked ArgoCD + - it: New Event-Reporter should be deployed with forked ArgoCD template: event-reporter.yaml values: - ./values/mandatory-values-ingress.yaml @@ -67,7 +67,20 @@ tests: kind: StatefulSet apiVersion: apps/v1 name: event-reporter - not: true + documentIndex: 4 + + - it: New Event-Reporter should be deployed with forked ArgoCD even if it's disabled in extras values + template: event-reporter.yaml + values: + - ./values/mandatory-values-ingress.yaml + set: + cf-argocd-extras.eventReporter.enabled: false + asserts: + - containsDocument: + kind: StatefulSet + apiVersion: apps/v1 + name: event-reporter + documentIndex: 4 - it: New Event-Reporter should be deployed with external OSS ArgoCD template: event-reporter.yaml diff --git a/charts/gitops-runtime/tests/forked-argocd_test.yaml b/charts/gitops-runtime/tests/forked-argocd_test.yaml new file mode 100644 index 00000000..88db129a --- /dev/null +++ b/charts/gitops-runtime/tests/forked-argocd_test.yaml @@ -0,0 +1,25 @@ +suite: forked argo-cd tests +templates: + - charts/argo-cd/* +tests: + - it: Should not have argo-cd-event-reporter in forked argo-cd + values: + - ./values/mandatory-values-ingress.yaml + asserts: + - containsDocument: + kind: StatefulSet + apiVersion: apps/v1 + name: argo-cd-event-reporter + not: true + - it: Should not have argo-cd-event-reporter in forked argo-cd even when it has old values + values: + - ./values/mandatory-values-ingress.yaml + set: + argo-cd.eventReporter.enabled: true + argo-cd.eventReporter.replicas: 2 + asserts: + - containsDocument: + kind: StatefulSet + apiVersion: apps/v1 + name: argo-cd-event-reporter + not: true diff --git a/charts/gitops-runtime/tests/v2-event-reporter_test.yaml b/charts/gitops-runtime/tests/v2-event-reporter_test.yaml deleted file mode 100644 index 85b3f1b1..00000000 --- a/charts/gitops-runtime/tests/v2-event-reporter_test.yaml +++ /dev/null @@ -1,29 +0,0 @@ -suite: cf-argocd-extras tests -templates: - - sources-server.yaml - - event-reporter.yaml - - charts/cf-argocd-extras/* -tests: - - it: New Event-Reporter should be deployed with forked ArgoCD - template: event-reporter.yaml - values: - - ./values/mandatory-values-ingress.yaml - asserts: - - containsDocument: - kind: StatefulSet - apiVersion: apps/v1 - name: event-reporter - -# - it: New Event-Reporter should be deployed with external OSS ArgoCD -# template: event-reporter.yaml -# documentSelector: -# path: kind -# value: StatefulSet -# values: -# - ./values/mandatory-values-ingress.yaml -# - ./values/external-argocd-values.yaml -# asserts: -# - containsDocument: -# kind: StatefulSet -# apiVersion: apps/v1 -# name: event-reporter From b7ab1891fcedde93f13d9875df814c6865d4019b Mon Sep 17 00:00:00 2001 From: oleksandr-codefresh Date: Mon, 5 May 2025 15:15:27 +0300 Subject: [PATCH 8/9] extras 0.3.20 --- charts/gitops-runtime/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gitops-runtime/Chart.yaml b/charts/gitops-runtime/Chart.yaml index d64c094f..43513175 100644 --- a/charts/gitops-runtime/Chart.yaml +++ b/charts/gitops-runtime/Chart.yaml @@ -49,4 +49,4 @@ dependencies: condition: garage-workflows-artifact-storage.enabled - name: cf-argocd-extras repository: oci://quay.io/codefresh/charts - version: 0.3.19 + version: 0.3.20 From b1932db6ace92999f2fce94c48295036e42f3408 Mon Sep 17 00:00:00 2001 From: Oleksandr Saulyak Date: Wed, 7 May 2025 08:37:41 +0300 Subject: [PATCH 9/9] upd appVersion because with old version out e2e failing because they think that git manifest from app-proxy not supported --- charts/gitops-runtime/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gitops-runtime/Chart.yaml b/charts/gitops-runtime/Chart.yaml index 763e84c9..afa8f03f 100644 --- a/charts/gitops-runtime/Chart.yaml +++ b/charts/gitops-runtime/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 0.1.69-0 +appVersion: 0.1.71 description: A Helm chart for Codefresh gitops runtime name: gitops-runtime version: 0.0.0