Skip to content

Commit ca1ded9

Browse files
oleksandr-codefresholeksandr-codefresh
authored
Merge pull request #69 from codefresh-io/CR-22894-argo-cd-2-10-helm-5-55
feat: argo 2.10 on helm base 5.55
2 parents 60850f9 + 142a967 commit ca1ded9

File tree

22 files changed

+428
-40
lines changed

22 files changed

+428
-40
lines changed

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ helm install charts/argo-workflows -n argo
124124
argo version
125125
```
126126

127-
Follow [these](https://argoproj.github.io/argo-workflows/quick-start/#submitting-an-example-workflow) instructions for running a hello world workflow.
127+
Follow [these](https://argo-workflows.readthedocs.io/en/stable/quick-start/#submitting-an-example-workflow) instructions for running a hello world workflow.
128128

129129
### Testing Argo CD Changes
130130

‎charts/argo-cd/Chart.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apiVersion: v2
2-
appVersion: v2.9-2024.4.10-dcc1723fd
2+
appVersion: v2.10-2024.3.29-1dcc54e29
33
kubeVersion: ">=1.23.0-0"
44
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
55
name: argo-cd
6-
version: 5.53.12-10-cap-2.9-2024.4.10-dcc1723fd
6+
version: 5.55.0-1-cap-2.10-2024.3.29-1dcc54e29
77
home: https://github.com/argoproj/argo-helm
88
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
99
sources:
@@ -27,4 +27,4 @@ annotations:
2727
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
2828
artifacthub.io/changes: |
2929
- kind: changed
30-
description: Upgrade argo-cd to v2.9-2024.4.10-dcc1723fd which includes fix for application versions
30+
description: Upgrade argo-cd to v2.10-2024.3.29-1dcc54e29

‎charts/argo-cd/README.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1044,6 +1044,18 @@ server:
10441044
| redis.exporter.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the redis-exporter |
10451045
| redis.exporter.image.repository | string | `"public.ecr.aws/bitnami/redis-exporter"` | Repository to use for the redis-exporter |
10461046
| redis.exporter.image.tag | string | `"1.57.0"` | Tag to use for the redis-exporter |
1047+
| redis.exporter.livenessProbe.enabled | bool | `false` | Enable Kubernetes liveness probe for Redis exporter |
1048+
| redis.exporter.livenessProbe.failureThreshold | int | `5` | Minimum consecutive failures for the [probe] to be considered failed after having succeeded |
1049+
| redis.exporter.livenessProbe.initialDelaySeconds | int | `30` | Number of seconds after the container has started before [probe] is initiated |
1050+
| redis.exporter.livenessProbe.periodSeconds | int | `15` | How often (in seconds) to perform the [probe] |
1051+
| redis.exporter.livenessProbe.successThreshold | int | `1` | Minimum consecutive successes for the [probe] to be considered successful after having failed |
1052+
| redis.exporter.livenessProbe.timeoutSeconds | int | `15` | Number of seconds after which the [probe] times out |
1053+
| redis.exporter.readinessProbe.enabled | bool | `false` | Enable Kubernetes liveness probe for Redis exporter (optional) |
1054+
| redis.exporter.readinessProbe.failureThreshold | int | `5` | Minimum consecutive failures for the [probe] to be considered failed after having succeeded |
1055+
| redis.exporter.readinessProbe.initialDelaySeconds | int | `30` | Number of seconds after the container has started before [probe] is initiated |
1056+
| redis.exporter.readinessProbe.periodSeconds | int | `15` | How often (in seconds) to perform the [probe] |
1057+
| redis.exporter.readinessProbe.successThreshold | int | `1` | Minimum consecutive successes for the [probe] to be considered successful after having failed |
1058+
| redis.exporter.readinessProbe.timeoutSeconds | int | `15` | Number of seconds after which the [probe] times out |
10471059
| redis.exporter.resources | object | `{}` | Resource limits and requests for redis-exporter sidecar |
10481060
| redis.extraArgs | list | `[]` | Additional command line arguments to pass to redis-server |
10491061
| redis.extraContainers | list | `[]` | Additional containers to be added to the redis pod |
@@ -1052,6 +1064,12 @@ server:
10521064
| redis.image.tag | string | `"7.0.15-alpine"` | Redis tag |
10531065
| redis.imagePullSecrets | list | `[]` (defaults to global.imagePullSecrets) | Secrets with credentials to pull images from a private registry |
10541066
| redis.initContainers | list | `[]` | Init containers to add to the redis pod |
1067+
| redis.livenessProbe.enabled | bool | `false` | Enable Kubernetes liveness probe for Redis server |
1068+
| redis.livenessProbe.failureThreshold | int | `5` | Minimum consecutive failures for the [probe] to be considered failed after having succeeded |
1069+
| redis.livenessProbe.initialDelaySeconds | int | `30` | Number of seconds after the container has started before [probe] is initiated |
1070+
| redis.livenessProbe.periodSeconds | int | `15` | How often (in seconds) to perform the [probe] |
1071+
| redis.livenessProbe.successThreshold | int | `1` | Minimum consecutive successes for the [probe] to be considered successful after having failed |
1072+
| redis.livenessProbe.timeoutSeconds | int | `15` | Number of seconds after which the [probe] times out |
10551073
| redis.metrics.enabled | bool | `false` | Deploy metrics service |
10561074
| redis.metrics.service.annotations | object | `{}` | Metrics service annotations |
10571075
| redis.metrics.service.clusterIP | string | `"None"` | Metrics service clusterIP. `None` makes a "headless service" (no virtual IP) |
@@ -1079,6 +1097,12 @@ server:
10791097
| redis.podAnnotations | object | `{}` | Annotations to be added to the Redis server pods |
10801098
| redis.podLabels | object | `{}` | Labels to be added to the Redis server pods |
10811099
| redis.priorityClassName | string | `""` (defaults to global.priorityClassName) | Priority class for redis pods |
1100+
| redis.readinessProbe.enabled | bool | `false` | Enable Kubernetes liveness probe for Redis server |
1101+
| redis.readinessProbe.failureThreshold | int | `5` | Minimum consecutive failures for the [probe] to be considered failed after having succeeded |
1102+
| redis.readinessProbe.initialDelaySeconds | int | `30` | Number of seconds after the container has started before [probe] is initiated |
1103+
| redis.readinessProbe.periodSeconds | int | `15` | How often (in seconds) to perform the [probe] |
1104+
| redis.readinessProbe.successThreshold | int | `1` | Minimum consecutive successes for the [probe] to be considered successful after having failed |
1105+
| redis.readinessProbe.timeoutSeconds | int | `15` | Number of seconds after which the [probe] times out |
10821106
| redis.resources | object | `{}` | Resource limits and requests for redis |
10831107
| redis.securityContext | object | See [values.yaml] | Redis pod-level security context |
10841108
| redis.service.annotations | object | `{}` | Redis service annotations |

‎charts/argo-cd/templates/argocd-application-controller/statefulset.yaml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,18 @@ spec:
122122
name: argocd-cm
123123
key: timeout.hard.reconciliation
124124
optional: true
125+
- name: ARGOCD_RECONCILIATION_JITTER
126+
valueFrom:
127+
configMapKeyRef:
128+
key: timeout.reconciliation.jitter
129+
name: argocd-cm
130+
optional: true
131+
- name: ARGOCD_REPO_ERROR_GRACE_PERIOD_SECONDS
132+
valueFrom:
133+
configMapKeyRef:
134+
name: argocd-cmd-params-cm
135+
key: controller.repo.error.grace.period.seconds
136+
optional: true
125137
- name: ARGOCD_APPLICATION_CONTROLLER_REPO_SERVER
126138
valueFrom:
127139
configMapKeyRef:
@@ -236,6 +248,18 @@ spec:
236248
name: argocd-cmd-params-cm
237249
key: otlp.address
238250
optional: true
251+
- name: ARGOCD_APPLICATION_CONTROLLER_OTLP_INSECURE
252+
valueFrom:
253+
configMapKeyRef:
254+
name: argocd-cmd-params-cm
255+
key: otlp.insecure
256+
optional: true
257+
- name: ARGOCD_APPLICATION_CONTROLLER_OTLP_HEADERS
258+
valueFrom:
259+
configMapKeyRef:
260+
name: argocd-cmd-params-cm
261+
key: otlp.headers
262+
optional: true
239263
- name: ARGOCD_APPLICATION_NAMESPACES
240264
valueFrom:
241265
configMapKeyRef:
@@ -254,6 +278,24 @@ spec:
254278
name: argocd-cmd-params-cm
255279
key: controller.kubectl.parallelism.limit
256280
optional: true
281+
- name: ARGOCD_K8SCLIENT_RETRY_MAX
282+
valueFrom:
283+
configMapKeyRef:
284+
name: argocd-cmd-params-cm
285+
key: controller.k8sclient.retry.max
286+
optional: true
287+
- name: ARGOCD_K8SCLIENT_RETRY_BASE_BACKOFF
288+
valueFrom:
289+
configMapKeyRef:
290+
name: argocd-cmd-params-cm
291+
key: controller.k8sclient.retry.base.backoff
292+
optional: true
293+
- name: ARGOCD_APPLICATION_CONTROLLER_SERVER_SIDE_DIFF
294+
valueFrom:
295+
configMapKeyRef:
296+
name: argocd-cmd-params-cm
297+
key: controller.diff.server.side
298+
optional: true
257299
{{- with .Values.controller.envFrom }}
258300
envFrom:
259301
{{- toYaml . | nindent 10 }}

‎charts/argo-cd/templates/argocd-applicationset/deployment.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,12 @@ spec:
210210
name: argocd-cmd-params-cm
211211
key: applicationsetcontroller.allowed.scm.providers
212212
optional: true
213+
- name: ARGOCD_APPLICATIONSET_CONTROLLER_ENABLE_SCM_PROVIDERS
214+
valueFrom:
215+
configMapKeyRef:
216+
name: argocd-cmd-params-cm
217+
key: applicationsetcontroller.enable.scm.providers
218+
optional: true
213219
{{- with .Values.applicationSet.extraEnvFrom }}
214220
envFrom:
215221
{{- toYaml . | nindent 12 }}

‎charts/argo-cd/templates/argocd-notifications/clusterrole.yaml‎

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,42 @@ rules:
1010
{{- toYaml . | nindent 2 }}
1111
{{- end }}
1212
- apiGroups:
13-
- "argoproj.io"
13+
- argoproj.io
1414
resources:
15-
- "applications"
15+
- applications
16+
- appprojects
1617
verbs:
1718
- get
1819
- list
1920
- watch
2021
- update
2122
- patch
23+
- apiGroups:
24+
- ""
25+
resources:
26+
- configmaps
27+
- secrets
28+
verbs:
29+
- list
30+
- watch
31+
{{- if .Values.notifications.cm.create }}
32+
- apiGroups:
33+
- ""
34+
resourceNames:
35+
- argocd-notifications-cm
36+
resources:
37+
- configmaps
38+
verbs:
39+
- get
40+
{{- end }}
41+
{{- if .Values.notifications.secret.create }}
42+
- apiGroups:
43+
- ""
44+
resourceNames:
45+
- argocd-notifications-secret
46+
resources:
47+
- secrets
48+
verbs:
49+
- get
50+
{{- end }}
2251
{{- end }}

‎charts/argo-cd/templates/argocd-notifications/deployment.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,12 @@ spec:
9191
key: application.namespaces
9292
name: argocd-cmd-params-cm
9393
optional: true
94+
- name: ARGOCD_NOTIFICATION_CONTROLLER_SELF_SERVICE_NOTIFICATION_ENABLED
95+
valueFrom:
96+
configMapKeyRef:
97+
key: notificationscontroller.selfservice.enabled
98+
name: argocd-cmd-params-cm
99+
optional: true
94100
{{- with .Values.notifications.extraEnvFrom }}
95101
envFrom:
96102
{{- toYaml . | nindent 12 }}

‎charts/argo-cd/templates/argocd-repo-server/deployment.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,18 @@ spec:
205205
name: argocd-cmd-params-cm
206206
key: otlp.address
207207
optional: true
208+
- name: ARGOCD_REPO_SERVER_OTLP_INSECURE
209+
valueFrom:
210+
configMapKeyRef:
211+
name: argocd-cmd-params-cm
212+
key: otlp.insecure
213+
optional: true
214+
- name: ARGOCD_REPO_SERVER_OTLP_HEADERS
215+
valueFrom:
216+
configMapKeyRef:
217+
name: argocd-cmd-params-cm
218+
key: otlp.headers
219+
optional: true
208220
- name: ARGOCD_REPO_SERVER_MAX_COMBINED_DIRECTORY_MANIFESTS_SIZE
209221
valueFrom:
210222
configMapKeyRef:
@@ -253,6 +265,18 @@ spec:
253265
key: reposerver.enable.git.submodule
254266
name: argocd-cmd-params-cm
255267
optional: true
268+
- name: ARGOCD_GIT_LS_REMOTE_PARALLELISM_LIMIT
269+
valueFrom:
270+
configMapKeyRef:
271+
key: reposerver.git.lsremote.parallelism.limit
272+
name: argocd-cmd-params-cm
273+
optional: true
274+
- name: ARGOCD_GIT_REQUEST_TIMEOUT
275+
valueFrom:
276+
configMapKeyRef:
277+
key: reposerver.git.request.timeout
278+
name: argocd-cmd-params-cm
279+
optional: true
256280
- name: CODEFRESH_URL
257281
valueFrom:
258282
configMapKeyRef:

‎charts/argo-cd/templates/argocd-server/deployment.yaml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,18 @@ spec:
287287
name: argocd-cmd-params-cm
288288
key: otlp.address
289289
optional: true
290+
- name: ARGOCD_SERVER_OTLP_INSECURE
291+
valueFrom:
292+
configMapKeyRef:
293+
name: argocd-cmd-params-cm
294+
key: otlp.insecure
295+
optional: true
296+
- name: ARGOCD_SERVER_OTLP_HEADERS
297+
valueFrom:
298+
configMapKeyRef:
299+
name: argocd-cmd-params-cm
300+
key: otlp.headers
301+
optional: true
290302
- name: ARGOCD_APPLICATION_NAMESPACES
291303
valueFrom:
292304
configMapKeyRef:
@@ -299,6 +311,24 @@ spec:
299311
name: argocd-cmd-params-cm
300312
key: server.enable.proxy.extension
301313
optional: true
314+
- name: ARGOCD_K8SCLIENT_RETRY_MAX
315+
valueFrom:
316+
configMapKeyRef:
317+
name: argocd-cmd-params-cm
318+
key: server.k8sclient.retry.max
319+
optional: true
320+
- name: ARGOCD_K8SCLIENT_RETRY_BASE_BACKOFF
321+
valueFrom:
322+
configMapKeyRef:
323+
name: argocd-cmd-params-cm
324+
key: server.k8sclient.retry.base.backoff
325+
optional: true
326+
- name: ARGOCD_API_CONTENT_TYPES
327+
valueFrom:
328+
configMapKeyRef:
329+
name: argocd-cmd-params-cm
330+
key: server.api.content.types
331+
optional: true
302332
{{- with .Values.server.envFrom }}
303333
envFrom:
304334
{{- toYaml . | nindent 10 }}

0 commit comments

Comments
 (0)