Skip to content

Commit b8cff90

Browse files
dmaizeldmaizel
committed
chore: remove argo-rollouts from gitops-runtime helm chart
Argo Rollouts was deprecated and disabled by default in a previous release. This commit completes the removal by: - Removing argo-rollouts dependency from Chart.yaml - Removing external-argo-rollouts and argo-rollouts configuration from values.yaml - Removing argo-rollouts helper function and component-list entry from _helpers.tpl - Removing ROLLOUTS_HELM_REPOSITORY/VERSION env vars from app-proxy - Removing argo-rollouts from all CI values files - Removing argo-rollouts from multi-runtime values files - Removing argo-rollouts tests and rollout-reporter references - Updating README documentation to remove argo-rollouts sections - Removing rollout-reporter from values-ha.yaml BREAKING CHANGE: argo-rollouts is no longer included in the chart. Users requiring Argo Rollouts must install it separately.
1 parent 35c6871 commit b8cff90

18 files changed

+0
-188
lines changed

‎charts/gitops-runtime/Chart.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ dependencies:
2626
repository: https://codefresh-io.github.io/argo-helm
2727
version: 0.45.18-v3.6.7-cap-CR-32333
2828
condition: argo-workflows.enabled
29-
- name: argo-rollouts
30-
repository: https://codefresh-io.github.io/argo-helm
31-
version: 2.37.3-7-v1.7.2-cap-OSS-697
32-
condition: argo-rollouts.enabled
3329
- name: sealed-secrets
3430
repository: https://bitnami-labs.github.io/sealed-secrets/
3531
version: 2.18.0

‎charts/gitops-runtime/README.md‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
- [Codefresh official documentation](#codefresh-official-documentation)
99
- [Argo-workflows artifact and log storage](#argo-workflows-artifact-and-log-storage)
1010
- [Installation with External ArgoCD](#installation-with-external-argocd)
11-
- [Installation with External Argo Rollouts](#installation-with-external-argo-rollouts)
1211
- [Using with private registries - Helper utility](#using-with-private-registries---helper-utility)
1312
- [Openshift](#openshift)
1413
- [High Availability](#high-availability)
@@ -62,8 +61,6 @@ argo-workflows:
6261
server:
6362
clusterWorkflowTemplates:
6463
enabled: false
65-
argo-rollouts:
66-
enabled: false
6764
tunnel-client:
6865
enabled: false
6966
gitops-operator:
@@ -82,8 +79,6 @@ argo-cd:
8279
argo-workflows:
8380
crds:
8481
install: true
85-
argo-rollouts:
86-
installCRDs: true
8782
gitops-operator:
8883
crds:
8984
install: true
@@ -191,26 +186,6 @@ data:
191186
admin.enabled: "true"
192187
```
193188

194-
## Installation with External Argo Rollouts
195-
196-
If you want to use an existing Argo Rollouts installation, you can disable the built-in Argo Rollouts and configure the GitOps Runtime to use the external Argo Rollouts.
197-
See the `values.yaml` example below:
198-
199-
```yaml
200-
global:
201-
# -- Configuration for external Argo Rollouts
202-
external-argo-rollouts:
203-
# -- Rollout reporter settings
204-
rollout-reporter:
205-
# -- Enable rollout reporter
206-
# Configuration is defined at .Values.event-reporters.rollout
207-
enabled: true
208-
209-
argo-rollouts:
210-
# -- Disable built-in Argo Rollouts
211-
enabled: false
212-
```
213-
214189
## Using with private registries - Helper utility
215190
The GitOps Runtime comprises multiple subcharts and container images. Subcharts also vary in values structure, making it difficult to override image specific values to use private registries.
216191
We have created a helper utility to resolve this issue:
@@ -602,10 +577,6 @@ global:
602577
| argo-events.enabled | bool | `true` | |
603578
| argo-events.fullnameOverride | string | `"argo-events"` | |
604579
| argo-gateway | object | `{"affinity":{},"hpa":{"enabled":true,"maxReplicas":10,"minReplicas":1,"targetCPUUtilizationPercentage":70},"image":{"registry":"quay.io","repository":"codefresh/cf-argocd-extras","tag":"d4fefcb"},"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 |
605-
| argo-rollouts.controller.replicas | int | `1` | |
606-
| argo-rollouts.enabled | bool | `true` | |
607-
| argo-rollouts.fullnameOverride | string | `"argo-rollouts"` | |
608-
| argo-rollouts.installCRDs | bool | `true` | |
609580
| argo-workflows.crds.install | bool | `true` | Install and upgrade CRDs |
610581
| argo-workflows.enabled | bool | `true` | |
611582
| argo-workflows.executor.resources.requests.ephemeral-storage | string | `"10Mi"` | |
@@ -665,9 +636,6 @@ global:
665636
| global.codefresh.userToken.secretKeyRef | object | `{}` | User token that references an existing secret containing the token. |
666637
| global.codefresh.userToken.token | string | `""` | User token in plain text. The chart creates and manages the secret for this token. |
667638
| global.event-reporters | object | `{"affinity":{},"config":{},"image":{"registry":"quay.io","repository":"codefresh/cf-argocd-extras","tag":"d4fefcb"},"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},"replicaCount":2,"resources":{"requests":{"cpu":"100m","memory":"128Mi"}},"service":{"ports":{"http":{"port":8088,"targetPort":8088},"metrics":{"port":8087,"targetPort":8087}},"type":"ClusterIP"},"serviceAccount":{"create":true},"serviceMonitor":{"enabled":false,"interval":"30s","labels":{},"scrapeTimeout":"10s"},"tolerations":[]}` | Global settings for event reporters Event reporters are used for reporting runtime and cluster resources to Codefresh platform |
668-
| global.external-argo-rollouts | object | `{"rollout-reporter":{"enabled":false}}` | Configuration for external Argo Rollouts |
669-
| global.external-argo-rollouts.rollout-reporter | object | `{"enabled":false}` | Rollout reporter settings |
670-
| global.external-argo-rollouts.rollout-reporter.enabled | bool | `false` | Enable or disable rollout reporter Configuration is defined at .Values.event-reporters.rollout |
671639
| global.httpProxy | string | `""` | global HTTP_PROXY for all components |
672640
| global.httpsProxy | string | `""` | global HTTPS_PROXY for all components |
673641
| global.imageRegistry | string | `""` | |

‎charts/gitops-runtime/README.md.gotmpl‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
- [Codefresh official documentation](#codefresh-official-documentation)
99
- [Argo-workflows artifact and log storage](#argo-workflows-artifact-and-log-storage)
1010
- [Installation with External ArgoCD](#installation-with-external-argocd)
11-
- [Installation with External Argo Rollouts](#installation-with-external-argo-rollouts)
1211
- [Using with private registries - Helper utility](#using-with-private-registries---helper-utility)
1312
- [Openshift](#openshift)
1413
- [High Availability](#high-availability)
@@ -62,8 +61,6 @@ argo-workflows:
6261
server:
6362
clusterWorkflowTemplates:
6463
enabled: false
65-
argo-rollouts:
66-
enabled: false
6764
tunnel-client:
6865
enabled: false
6966
gitops-operator:
@@ -82,8 +79,6 @@ argo-cd:
8279
argo-workflows:
8380
crds:
8481
install: true
85-
argo-rollouts:
86-
installCRDs: true
8782
gitops-operator:
8883
crds:
8984
install: true
@@ -194,26 +189,6 @@ data:
194189
admin.enabled: "true"
195190
```
196191

197-
## Installation with External Argo Rollouts
198-
199-
If you want to use an existing Argo Rollouts installation, you can disable the built-in Argo Rollouts and configure the GitOps Runtime to use the external Argo Rollouts.
200-
See the `values.yaml` example below:
201-
202-
```yaml
203-
global:
204-
# -- Configuration for external Argo Rollouts
205-
external-argo-rollouts:
206-
# -- Rollout reporter settings
207-
rollout-reporter:
208-
# -- Enable rollout reporter
209-
# Configuration is defined at .Values.event-reporters.rollout
210-
enabled: true
211-
212-
argo-rollouts:
213-
# -- Disable built-in Argo Rollouts
214-
enabled: false
215-
```
216-
217192
## Using with private registries - Helper utility
218193
The GitOps Runtime comprises multiple subcharts and container images. Subcharts also vary in values structure, making it difficult to override image specific values to use private registries.
219194
We have created a helper utility to resolve this issue:

‎charts/gitops-runtime/ci/default-values-custom-tls.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,3 @@ global:
6060
username: 'username'
6161
password: 'dummy'
6262

63-
64-
argo-rollouts:
65-
enabled: true

‎charts/gitops-runtime/ci/default-values.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,3 @@ global:
2121
username: 'username'
2222
password: 'dummy'
2323

24-
25-
argo-rollouts:
26-
enabled: true

‎charts/gitops-runtime/ci/ingressless-values.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,3 @@ global:
1818
url: 'https://github.com'
1919
username: 'username'
2020
password: 'dummy'
21-
argo-rollouts:
22-
enabled: true

‎charts/gitops-runtime/ci/values-all-images.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ global:
2323
username: 'username'
2424
password: 'dummy'
2525

26-
argo-rollouts:
27-
dashboard:
28-
enabled: true
29-
3026
argo-cd:
3127
redis-ha:
3228
enabled: true

‎charts/gitops-runtime/ci/values-external-argocd.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ global:
2323
username: 'username'
2424
password: 'dummy'
2525

26-
argo-rollouts:
27-
dashboard:
28-
enabled: true
29-
3026
argo-cd:
3127
enabled: false
3228

‎charts/gitops-runtime/templates/_helpers.tpl‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -123,18 +123,6 @@ Determine argocd repoServer url
123123
{{- end }}
124124
{{- end}}
125125

126-
{{/*
127-
Determine rollouts name
128-
*/}}
129-
{{- define "codefresh-gitops-runtime.argo-rollouts.name" -}}
130-
{{- if (index .Values "argo-rollouts" "enabled") }}
131-
{{/* For now use template from rollouts chart until better approach */}}
132-
{{- template "argo-rollouts.fullname" (dict "Values" (get .Values "argo-rollouts")) }}
133-
{{- else }}
134-
{{- printf "argo-rollouts" }}
135-
{{- end }}
136-
{{- end }}
137-
138126
{{/*
139127
Determine argocd server service port. Must be called with chart root context
140128
*/}}
@@ -394,12 +382,6 @@ Output comma separated list of installed runtime components
394382
{{- $argoEvents := dict "name" "argo-events" "version" (get .Subcharts "argo-events").Chart.AppVersion }}
395383
{{- $comptList = append $comptList $argoEvents }}
396384
{{- end }}
397-
{{- if index (get .Values "argo-rollouts") "enabled" }}
398-
{{- $rolloutReporter := dict "name" "rollout-reporter" "version" .Chart.AppVersion }}
399-
{{- $argoRollouts := dict "name" "argo-rollouts" "version" (get .Subcharts "argo-rollouts").Chart.AppVersion }}
400-
{{- $comptList = append $comptList $argoRollouts }}
401-
{{- $comptList = append $comptList $rolloutReporter }}
402-
{{- end }}
403385
{{- if index (get .Values "argo-workflows") "enabled" }}
404386
{{- $workflowReporter := dict "name" "workflow-reporter" "version" .Chart.AppVersion }}
405387
{{- $argoWorkflows := dict "name" "argo-workflows" "version" (get .Subcharts "argo-workflows").Chart.AppVersion }}

‎charts/gitops-runtime/templates/app-proxy/_app-proxy-env.yaml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,4 @@ TARGET_RUNTIME_ACCOUNT_ID: {{ .Values.global.codefresh.accountId }}
2323
{{- fail "global.codefresh.accountId must be provided for hosted runtimes"}}
2424
{{- end }}
2525
{{- end }}
26-
{{/*
27-
This will promote argo-rollouts dependency version to app-proxy.
28-
This will be used when installing argo-rollouts using button.
29-
*/}}
30-
{{- range $d := .Chart.Dependencies }}
31-
{{- if eq $d.Name "argo-rollouts" }}
32-
ROLLOUTS_HELM_REPOSITORY: {{ $d.Repository | quote }}
33-
ROLLOUTS_HELM_VERSION: {{ $d.Version | quote }}
34-
{{- end }}
35-
{{- end }}
3626
{{- end }}

0 commit comments

Comments
 (0)