diff --git a/charts/gitops-runtime/Chart.yaml b/charts/gitops-runtime/Chart.yaml index 119d03f2..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 @@ -17,7 +17,7 @@ dependencies: - name: argo-cd 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 @@ -49,4 +49,4 @@ dependencies: condition: garage-workflows-artifact-storage.enabled - name: cf-argocd-extras repository: oci://quay.io/codefresh/charts - version: 0.3.17 + version: 0.3.20 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..2242e8fb 100644 --- a/charts/gitops-runtime/templates/event-reporter.yaml +++ b/charts/gitops-runtime/templates/event-reporter.yaml @@ -1,5 +1,5 @@ +{{- $cfArgoCdExtrasContext := (index .Subcharts "cf-argocd-extras")}} {{- if not (index .Values "argo-cd" "enabled") }} - {{- $cfArgoCdExtrasContext := (index .Subcharts "cf-argocd-extras")}} {{- $_ := 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" . ) }} @@ -19,5 +19,5 @@ {{- $_ := 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 }} +{{ include "cf-argocd-extras.event-reporter.resources" $cfArgoCdExtrasContext }} \ No newline at end of file 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/values.yaml b/charts/gitops-runtime/values.yaml index e4505038..f79d168f 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -248,16 +248,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 @@ -745,6 +735,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