Skip to content

Commit 7030e20

Browse files
dmaizelcf-ci-bot-v2
andauthored
chore: cherry-pick remove argo-events controller to stable/0.27 (#1062)
* chore: remove argo-events controller from gitops-runtime helm chart (#1057) Argo Events was deprecated in 0.26.0 with resources removed but controller retained for cleanup. This commit completes the removal by: - Removing argo-events dependency from Chart.yaml - Removing argo-events configuration from values.yaml - Removing argo-events from multi-runtime values files - Removing argo-events helper function and component-list entry from _helpers.tpl - Removing argo-events from test files - Updating README documentation to remove argo-events sections - Deleting argo-events CRDs from crds/ directory ## Breaking Changes ### 1. Argo Events Controller Removed **The Argo Events controller has been completely removed from this release.** In release 0.26.0, Argo Events was deprecated and all Argo Events resources (EventBus, EventSource, Sensor) were removed. The controller was kept temporarily to facilitate cleanup of existing resources. **CRITICAL UPGRADE REQUIREMENT:** - You **MUST** upgrade to version 0.26.x before upgrading to 0.27.0 or higher - This ensures that any existing Argo Events resources are properly cleaned up by the controller before it is removed - Upgrading directly from versions prior to 0.26.0 to 0.27.0+ may leave orphaned Argo Events resources in your cluster **If you skipped 0.26.x:** 1. Manually delete any remaining EventBus, EventSource, and Sensor resources 2. Manually delete the Argo Events CRDs if no longer needed 3. Then proceed with the upgrade to 0.27.0+ **Replacement:** Event reporting functionality has been replaced by: - `runtime-event-reporter` component - `cluster-event-reporter` component * CI Automatic commit - align Chart version --------- Co-authored-by: cf-ci-bot-v2 <cf-ci-bot-v2@codefresh.io>
1 parent 9de7511 commit 7030e20

File tree

11 files changed

+1
-194
lines changed

11 files changed

+1
-194
lines changed

charts/gitops-runtime/Chart.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
appVersion: 0.1.72
33
description: A Helm chart for Codefresh gitops runtime
44
name: gitops-runtime
5-
version: 0.0.0
5+
version: 0.27.0
66
home: https://github.com/codefresh-io/gitops-runtime-helm
77
icon: https://avatars1.githubusercontent.com/u/11412079?v=3
88
keywords:
@@ -18,10 +18,6 @@ dependencies:
1818
repository: https://argoproj.github.io/argo-helm
1919
condition: argo-cd.enabled
2020
version: 9.3.0
21-
- name: argo-events
22-
repository: https://codefresh-io.github.io/argo-helm
23-
version: 2.4.9-cap-CR-30841
24-
condition: argo-events.enabled
2521
- name: argo-workflows
2622
repository: https://codefresh-io.github.io/argo-helm
2723
version: 0.45.18-v3.6.7-cap-CR-32333

charts/gitops-runtime/README.md

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ argo-cd:
4646
configs:
4747
params:
4848
application.namespaces: ''
49-
argo-events:
50-
controller:
51-
rbac:
52-
namespaced: true
5349
argo-workflows:
5450
crds:
5551
install: false
@@ -229,12 +225,6 @@ argo-cd:
229225
openshift:
230226
enabled: true
231227
232-
argo-events:
233-
openshift: true
234-
235-
webhook:
236-
port: 8443
237-
238228
sealed-secrets:
239229
podSecurityContext:
240230
enabled: false
@@ -599,17 +589,6 @@ global:
599589
| argo-cd.redis-ha.image.tag | string | `"8.2.2-alpine"` | Redis tag |
600590
| argo-cd.redis.image.repository | string | `"ecr-public.aws.com/docker/library/redis"` | Redis repository |
601591
| argo-cd.redis.image.tag | string | `"8.2.2-alpine"` | Redis tag |
602-
| argo-events.configs.jetstream.versions[0].configReloaderImage | string | `"natsio/nats-server-config-reloader:0.19.1"` | |
603-
| argo-events.configs.jetstream.versions[0].metricsExporterImage | string | `"natsio/prometheus-nats-exporter:0.17.3"` | |
604-
| argo-events.configs.jetstream.versions[0].natsImage | string | `"nats:2.11.4"` | |
605-
| argo-events.configs.jetstream.versions[0].startCommand | string | `"/nats-server"` | |
606-
| argo-events.configs.jetstream.versions[0].version | string | `"latest"` | |
607-
| argo-events.configs.nats.versions[0].metricsExporterImage | string | `"natsio/prometheus-nats-exporter:0.16.0"` | |
608-
| argo-events.configs.nats.versions[0].natsStreamingImage | string | `"nats-streaming:0.25.6"` | |
609-
| argo-events.configs.nats.versions[0].version | string | `"0.22.1"` | |
610-
| argo-events.crds.install | bool | `false` | |
611-
| argo-events.enabled | bool | `true` | |
612-
| argo-events.fullnameOverride | string | `"argo-events"` | |
613592
| argo-gateway | object | `{"affinity":{},"hpa":{"enabled":true,"maxReplicas":10,"minReplicas":1,"targetCPUUtilizationPercentage":70},"image":{"registry":"quay.io","repository":"codefresh/cf-argocd-extras","tag":"bc37d62"},"livenessProbe":{"failureThreshold":3,"initialDelaySeconds":10,"periodSeconds":10,"successThreshold":1,"timeoutSeconds":10},"nodeSelector":{},"pdb":{"enabled":true,"maxUnavailable":"","minAvailable":"50%"},"readinessProbe":{"failureThreshold":3,"initialDelaySeconds":10,"periodSeconds":10,"successThreshold":1,"timeoutSeconds":10},"resources":{"requests":{"cpu":"100m","memory":"128Mi"}},"service":{"type":"ClusterIP"},"serviceAccount":{"create":true},"serviceMonitor":{"enabled":false,"interval":"30s","labels":{},"scrapeTimeout":"10s"},"tolerations":[]}` | Argo Gateway Argo Gateway is used to perform operations on ArgoCD from Codefresh platform |
614593
| argo-workflows.crds.install | bool | `true` | Install and upgrade CRDs |
615594
| argo-workflows.enabled | bool | `true` | |

charts/gitops-runtime/README.md.gotmpl

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ argo-cd:
4646
configs:
4747
params:
4848
application.namespaces: ''
49-
argo-events:
50-
controller:
51-
rbac:
52-
namespaced: true
5349
argo-workflows:
5450
crds:
5551
install: false
@@ -234,12 +230,6 @@ argo-cd:
234230
openshift:
235231
enabled: true
236232
237-
argo-events:
238-
openshift: true
239-
240-
webhook:
241-
port: 8443
242-
243233
sealed-secrets:
244234
podSecurityContext:
245235
enabled: false

charts/gitops-runtime/crds/argo-events/argoproj.io_eventbus.yaml

Lines changed: 0 additions & 40 deletions
This file was deleted.

charts/gitops-runtime/crds/argo-events/argoproj.io_eventsources.yaml

Lines changed: 0 additions & 40 deletions
This file was deleted.

charts/gitops-runtime/crds/argo-events/argoproj.io_sensors.yaml

Lines changed: 0 additions & 40 deletions
This file was deleted.

charts/gitops-runtime/templates/_helpers.tpl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -378,10 +378,6 @@ Output comma separated list of installed runtime components
378378
{{- $argoCD := dict "name" "argocd" "version" (get .Subcharts "argo-cd").Chart.AppVersion }}
379379
{{- $comptList = append $comptList $argoCD }}
380380
{{- end }}
381-
{{- if index (get .Values "argo-events") "enabled" }}
382-
{{- $argoEvents := dict "name" "argo-events" "version" (get .Subcharts "argo-events").Chart.AppVersion }}
383-
{{- $comptList = append $comptList $argoEvents }}
384-
{{- end }}
385381
{{- if index (get .Values "argo-workflows") "enabled" }}
386382
{{- $workflowReporter := dict "name" "workflow-reporter" "version" .Chart.AppVersion }}
387383
{{- $argoWorkflows := dict "name" "argo-workflows" "version" (get .Subcharts "argo-workflows").Chart.AppVersion }}

charts/gitops-runtime/tests/global_constraints_test.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ templates:
1313
- hooks/pre-install/validate-usage.yaml
1414
- hooks/pre-uninstall/cleanup-resources.yaml
1515
- hooks/pre-uninstall/delete-runtime-from-platform.yaml
16-
- charts/argo-events/*
1716
- charts/argo-workflows/*
1817
- _components/cap-app-proxy/_deployment.yaml
1918
- _components/cap-app-proxy/_config.yaml

charts/gitops-runtime/tests/values/subcharts-constraints-values.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,6 @@ tunnel-client:
5353
nodeSelector: *nodeSelector
5454
tolerations: *tolerations
5555

56-
argo-events:
57-
controller:
58-
nodeSelector: *nodeSelector
59-
tolerations: *tolerations
60-
webhook:
61-
nodeSelector: *nodeSelector
62-
tolerations: *tolerations
63-
6456
argo-workflows:
6557
controller:
6658
nodeSelector: *nodeSelector

charts/gitops-runtime/values-multi-runtimes.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ argo-cd:
1010
configs:
1111
params:
1212
application.namespaces: ''
13-
argo-events:
14-
controller:
15-
rbac:
16-
namespaced: true
1713
argo-workflows:
1814
crds:
1915
install: false

0 commit comments

Comments
 (0)