diff --git a/charts/gitops-runtime/Chart.yaml b/charts/gitops-runtime/Chart.yaml index 513a3c4ee..2974b8e91 100644 --- a/charts/gitops-runtime/Chart.yaml +++ b/charts/gitops-runtime/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: 0.1.72 description: A Helm chart for Codefresh gitops runtime name: gitops-runtime -version: 0.0.0 +version: 0.27.0 home: https://github.com/codefresh-io/gitops-runtime-helm icon: https://avatars1.githubusercontent.com/u/11412079?v=3 keywords: @@ -18,10 +18,6 @@ dependencies: repository: https://argoproj.github.io/argo-helm condition: argo-cd.enabled version: 9.3.0 - - name: argo-events - repository: https://codefresh-io.github.io/argo-helm - version: 2.4.9-cap-CR-30841 - condition: argo-events.enabled - name: argo-workflows repository: https://codefresh-io.github.io/argo-helm version: 0.45.18-v3.6.7-cap-CR-32333 diff --git a/charts/gitops-runtime/README.md b/charts/gitops-runtime/README.md index 73527041b..000dcfcca 100644 --- a/charts/gitops-runtime/README.md +++ b/charts/gitops-runtime/README.md @@ -46,10 +46,6 @@ argo-cd: configs: params: application.namespaces: '' -argo-events: - controller: - rbac: - namespaced: true argo-workflows: crds: install: false @@ -229,12 +225,6 @@ argo-cd: openshift: enabled: true -argo-events: - openshift: true - - webhook: - port: 8443 - sealed-secrets: podSecurityContext: enabled: false @@ -599,17 +589,6 @@ global: | argo-cd.redis-ha.image.tag | string | `"8.2.2-alpine"` | Redis tag | | argo-cd.redis.image.repository | string | `"ecr-public.aws.com/docker/library/redis"` | Redis repository | | argo-cd.redis.image.tag | string | `"8.2.2-alpine"` | Redis tag | -| argo-events.configs.jetstream.versions[0].configReloaderImage | string | `"natsio/nats-server-config-reloader:0.19.1"` | | -| argo-events.configs.jetstream.versions[0].metricsExporterImage | string | `"natsio/prometheus-nats-exporter:0.17.3"` | | -| argo-events.configs.jetstream.versions[0].natsImage | string | `"nats:2.11.4"` | | -| argo-events.configs.jetstream.versions[0].startCommand | string | `"/nats-server"` | | -| argo-events.configs.jetstream.versions[0].version | string | `"latest"` | | -| argo-events.configs.nats.versions[0].metricsExporterImage | string | `"natsio/prometheus-nats-exporter:0.16.0"` | | -| argo-events.configs.nats.versions[0].natsStreamingImage | string | `"nats-streaming:0.25.6"` | | -| argo-events.configs.nats.versions[0].version | string | `"0.22.1"` | | -| argo-events.crds.install | bool | `false` | | -| argo-events.enabled | bool | `true` | | -| argo-events.fullnameOverride | string | `"argo-events"` | | | 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 | | argo-workflows.crds.install | bool | `true` | Install and upgrade CRDs | | argo-workflows.enabled | bool | `true` | | diff --git a/charts/gitops-runtime/README.md.gotmpl b/charts/gitops-runtime/README.md.gotmpl index bf99d987d..65a5f27a0 100644 --- a/charts/gitops-runtime/README.md.gotmpl +++ b/charts/gitops-runtime/README.md.gotmpl @@ -46,10 +46,6 @@ argo-cd: configs: params: application.namespaces: '' -argo-events: - controller: - rbac: - namespaced: true argo-workflows: crds: install: false @@ -234,12 +230,6 @@ argo-cd: openshift: enabled: true -argo-events: - openshift: true - - webhook: - port: 8443 - sealed-secrets: podSecurityContext: enabled: false diff --git a/charts/gitops-runtime/crds/argo-events/argoproj.io_eventbus.yaml b/charts/gitops-runtime/crds/argo-events/argoproj.io_eventbus.yaml deleted file mode 100644 index c9d797374..000000000 --- a/charts/gitops-runtime/crds/argo-events/argoproj.io_eventbus.yaml +++ /dev/null @@ -1,40 +0,0 @@ -# This is an auto-generated file. DO NOT EDIT -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - name: eventbus.argoproj.io -spec: - group: argoproj.io - names: - kind: EventBus - listKind: EventBusList - plural: eventbus - shortNames: - - eb - singular: eventbus - scope: Namespaced - versions: - - name: v1alpha1 - schema: - openAPIV3Schema: - properties: - apiVersion: - type: string - kind: - type: string - metadata: - type: object - spec: - type: object - x-kubernetes-preserve-unknown-fields: true - status: - type: object - x-kubernetes-preserve-unknown-fields: true - required: - - metadata - - spec - type: object - served: true - storage: true - subresources: - status: {} diff --git a/charts/gitops-runtime/crds/argo-events/argoproj.io_eventsources.yaml b/charts/gitops-runtime/crds/argo-events/argoproj.io_eventsources.yaml deleted file mode 100644 index 320aec42c..000000000 --- a/charts/gitops-runtime/crds/argo-events/argoproj.io_eventsources.yaml +++ /dev/null @@ -1,40 +0,0 @@ -# This is an auto-generated file. DO NOT EDIT -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - name: eventsources.argoproj.io -spec: - group: argoproj.io - names: - kind: EventSource - listKind: EventSourceList - plural: eventsources - shortNames: - - es - singular: eventsource - scope: Namespaced - versions: - - name: v1alpha1 - schema: - openAPIV3Schema: - properties: - apiVersion: - type: string - kind: - type: string - metadata: - type: object - spec: - type: object - x-kubernetes-preserve-unknown-fields: true - status: - type: object - x-kubernetes-preserve-unknown-fields: true - required: - - metadata - - spec - type: object - served: true - storage: true - subresources: - status: {} diff --git a/charts/gitops-runtime/crds/argo-events/argoproj.io_sensors.yaml b/charts/gitops-runtime/crds/argo-events/argoproj.io_sensors.yaml deleted file mode 100644 index 473fe87e5..000000000 --- a/charts/gitops-runtime/crds/argo-events/argoproj.io_sensors.yaml +++ /dev/null @@ -1,40 +0,0 @@ -# This is an auto-generated file. DO NOT EDIT -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - name: sensors.argoproj.io -spec: - group: argoproj.io - names: - kind: Sensor - listKind: SensorList - plural: sensors - shortNames: - - sn - singular: sensor - scope: Namespaced - versions: - - name: v1alpha1 - schema: - openAPIV3Schema: - properties: - apiVersion: - type: string - kind: - type: string - metadata: - type: object - spec: - type: object - x-kubernetes-preserve-unknown-fields: true - status: - type: object - x-kubernetes-preserve-unknown-fields: true - required: - - metadata - - spec - type: object - served: true - storage: true - subresources: - status: {} diff --git a/charts/gitops-runtime/templates/_helpers.tpl b/charts/gitops-runtime/templates/_helpers.tpl index 56463eadc..2e0b67207 100644 --- a/charts/gitops-runtime/templates/_helpers.tpl +++ b/charts/gitops-runtime/templates/_helpers.tpl @@ -378,10 +378,6 @@ Output comma separated list of installed runtime components {{- $argoCD := dict "name" "argocd" "version" (get .Subcharts "argo-cd").Chart.AppVersion }} {{- $comptList = append $comptList $argoCD }} {{- end }} - {{- if index (get .Values "argo-events") "enabled" }} - {{- $argoEvents := dict "name" "argo-events" "version" (get .Subcharts "argo-events").Chart.AppVersion }} - {{- $comptList = append $comptList $argoEvents }} - {{- end }} {{- if index (get .Values "argo-workflows") "enabled" }} {{- $workflowReporter := dict "name" "workflow-reporter" "version" .Chart.AppVersion }} {{- $argoWorkflows := dict "name" "argo-workflows" "version" (get .Subcharts "argo-workflows").Chart.AppVersion }} diff --git a/charts/gitops-runtime/tests/global_constraints_test.yaml b/charts/gitops-runtime/tests/global_constraints_test.yaml index 43e6aa3a7..3081e1f7e 100644 --- a/charts/gitops-runtime/tests/global_constraints_test.yaml +++ b/charts/gitops-runtime/tests/global_constraints_test.yaml @@ -13,7 +13,6 @@ templates: - hooks/pre-install/validate-usage.yaml - hooks/pre-uninstall/cleanup-resources.yaml - hooks/pre-uninstall/delete-runtime-from-platform.yaml - - charts/argo-events/* - charts/argo-workflows/* - _components/cap-app-proxy/_deployment.yaml - _components/cap-app-proxy/_config.yaml diff --git a/charts/gitops-runtime/tests/values/subcharts-constraints-values.yaml b/charts/gitops-runtime/tests/values/subcharts-constraints-values.yaml index 0f4e7120d..e9d3f1599 100644 --- a/charts/gitops-runtime/tests/values/subcharts-constraints-values.yaml +++ b/charts/gitops-runtime/tests/values/subcharts-constraints-values.yaml @@ -53,14 +53,6 @@ tunnel-client: nodeSelector: *nodeSelector tolerations: *tolerations -argo-events: - controller: - nodeSelector: *nodeSelector - tolerations: *tolerations - webhook: - nodeSelector: *nodeSelector - tolerations: *tolerations - argo-workflows: controller: nodeSelector: *nodeSelector diff --git a/charts/gitops-runtime/values-multi-runtimes.yaml b/charts/gitops-runtime/values-multi-runtimes.yaml index 7d2767625..5450bdd18 100644 --- a/charts/gitops-runtime/values-multi-runtimes.yaml +++ b/charts/gitops-runtime/values-multi-runtimes.yaml @@ -10,10 +10,6 @@ argo-cd: configs: params: application.namespaces: '' -argo-events: - controller: - rbac: - namespaced: true argo-workflows: crds: install: false diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index 1e68b6e3e..a8d9a2ad5 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -287,27 +287,6 @@ argo-cd: statefulsetAnnotations: argocd.argoproj.io/sync-options: "Delete=false" #----------------------------------------------------------------------------------------------------------------------- -# Argo Events -#----------------------------------------------------------------------------------------------------------------------- -argo-events: - enabled: true - fullnameOverride: argo-events - crds: - install: false - configs: - nats: - versions: - - version: 0.22.1 - natsStreamingImage: nats-streaming:0.25.6 - metricsExporterImage: natsio/prometheus-nats-exporter:0.16.0 - jetstream: - versions: - - version: latest - natsImage: nats:2.11.4 - metricsExporterImage: natsio/prometheus-nats-exporter:0.17.3 - configReloaderImage: natsio/nats-server-config-reloader:0.19.1 - startCommand: /nats-server -#----------------------------------------------------------------------------------------------------------------------- # Argo Workflows #----------------------------------------------------------------------------------------------------------------------- argo-workflows: