Skip to content

Commit 7cfafe5

Browse files
yu-crocoyu-croco
authored
feat(argo-cd): Upgrade Argo CD v3.1.0 (#3438)
Signed-off-by: yu-croco <[email protected]>
1 parent 42790b1 commit 7cfafe5

File tree

7 files changed

+57
-36
lines changed

7 files changed

+57
-36
lines changed

‎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: v3.0.12
2+
appVersion: v3.1.0
33
kubeVersion: ">=1.25.0-0"
44
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
55
name: argo-cd
6-
version: 8.2.7
6+
version: 8.3.0
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: Update redis_exporter for redis-ha to v1.75.0
30+
description: Update Argo CD v3.1.0

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,12 @@ spec:
220220
name: argocd-cmd-params-cm
221221
key: applicationsetcontroller.enable.scm.providers
222222
optional: true
223+
- name: ARGOCD_APPLICATIONSET_CONTROLLER_ENABLE_GITHUB_API_METRICS
224+
valueFrom:
225+
configMapKeyRef:
226+
name: argocd-cmd-params-cm
227+
key: applicationsetcontroller.enable.github.api.metrics
228+
optional: true
223229
- name: ARGOCD_APPLICATIONSET_CONTROLLER_WEBHOOK_PARALLELISM_LIMIT
224230
valueFrom:
225231
configMapKeyRef:

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -160,23 +160,6 @@ spec:
160160
# We need a writeable temp directory for the askpass socket file.
161161
- name: tmp
162162
mountPath: /tmp
163-
initContainers:
164-
- command:
165-
- /bin/cp
166-
- -n
167-
- /usr/local/bin/argocd
168-
- /var/run/argocd/argocd-cmp-server
169-
image: {{ default .Values.global.image.repository .Values.commitServer.image.repository }}:{{ default (include "argo-cd.defaultTag" .) .Values.commitServer.image.tag }}
170-
name: copyutil
171-
resources:
172-
{{- toYaml .Values.commitServer.resources | nindent 10 }}
173-
{{- with .Values.commitServer.containerSecurityContext }}
174-
securityContext:
175-
{{- toYaml . | nindent 10 }}
176-
{{- end }}
177-
volumeMounts:
178-
- mountPath: /var/run/argocd
179-
name: var-files
180163
volumes:
181164
{{- with .Values.commitServer.extraVolumes }}
182165
{{- toYaml . | nindent 8 }}
@@ -205,8 +188,6 @@ spec:
205188
path: tls.key
206189
- key: ca.crt
207190
path: ca.crt
208-
- emptyDir: {}
209-
name: var-files
210191
{{- with include "argo-cd.affinity" (dict "context" . "component" .Values.commitServer) }}
211192
affinity:
212193
{{- trim . | nindent 8 }}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -210,12 +210,6 @@ spec:
210210
name: argocd-cmd-params-cm
211211
key: server.oidc.cache.expiration
212212
optional: true
213-
- name: ARGOCD_SERVER_LOGIN_ATTEMPTS_EXPIRATION
214-
valueFrom:
215-
configMapKeyRef:
216-
name: argocd-cmd-params-cm
217-
key: server.login.attempts.expiration
218-
optional: true
219213
- name: ARGOCD_SERVER_STATIC_ASSETS
220214
valueFrom:
221215
configMapKeyRef:
@@ -374,6 +368,12 @@ spec:
374368
name: argocd-cmd-params-cm
375369
key: applicationsetcontroller.enable.scm.providers
376370
optional: true
371+
- name: ARGOCD_APPLICATIONSET_CONTROLLER_ENABLE_GITHUB_API_METRICS
372+
valueFrom:
373+
configMapKeyRef:
374+
name: argocd-cmd-params-cm
375+
key: applicationsetcontroller.enable.github.api.metrics
376+
optional: true
377377
- name: ARGOCD_HYDRATOR_ENABLED
378378
valueFrom:
379379
configMapKeyRef:

‎charts/argo-cd/templates/crds/crd-application.yaml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2000,12 +2000,13 @@ spec:
20002000
format: date-time
20012001
type: string
20022002
message:
2003-
description: Message is a human-readable informational message
2004-
describing the health status
2003+
description: |-
2004+
Message is a human-readable informational message describing the health status
2005+
2006+
Deprecated: this field is not used and will be removed in a future release.
20052007
type: string
20062008
status:
2007-
description: Status holds the status code of the application or
2008-
resource
2009+
description: Status holds the status code of the application
20092010
type: string
20102011
type: object
20112012
history:
@@ -3874,6 +3875,12 @@ spec:
38743875
description: HookType specifies the type of the hook.
38753876
Empty for non-hook resources
38763877
type: string
3878+
images:
3879+
description: Images contains the images related to the
3880+
ResourceResult
3881+
items:
3882+
type: string
3883+
type: array
38773884
kind:
38783885
description: Kind specifies the API kind of the resource
38793886
type: string
@@ -4751,17 +4758,18 @@ spec:
47514758
(e.g., Healthy, Degraded, Progressing).
47524759
properties:
47534760
lastTransitionTime:
4754-
description: LastTransitionTime is the time the HealthStatus
4755-
was set or updated
4761+
description: |-
4762+
LastTransitionTime is the time the HealthStatus was set or updated
4763+
4764+
Deprecated: this field is not used and will be removed in a future release.
47564765
format: date-time
47574766
type: string
47584767
message:
47594768
description: Message is a human-readable informational message
47604769
describing the health status
47614770
type: string
47624771
status:
4763-
description: Status holds the status code of the application
4764-
or resource
4772+
description: Status holds the status code of the resource
47654773
type: string
47664774
type: object
47674775
hook:

‎charts/argo-cd/templates/crds/crd-applicationset.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1428,6 +1428,8 @@ spec:
14281428
files:
14291429
items:
14301430
properties:
1431+
exclude:
1432+
type: boolean
14311433
path:
14321434
type: string
14331435
required:
@@ -4138,6 +4140,8 @@ spec:
41384140
files:
41394141
items:
41404142
properties:
4143+
exclude:
4144+
type: boolean
41414145
path:
41424146
type: string
41434147
required:
@@ -6284,6 +6288,10 @@ spec:
62846288
type: string
62856289
insecure:
62866290
type: boolean
6291+
labels:
6292+
items:
6293+
type: string
6294+
type: array
62876295
owner:
62886296
type: string
62896297
repo:
@@ -9972,6 +9980,8 @@ spec:
99729980
files:
99739981
items:
99749982
properties:
9983+
exclude:
9984+
type: boolean
99759985
path:
99769986
type: string
99779987
required:
@@ -12118,6 +12128,10 @@ spec:
1211812128
type: string
1211912129
insecure:
1212012130
type: boolean
12131+
labels:
12132+
items:
12133+
type: string
12134+
type: array
1212112135
owner:
1212212136
type: string
1212312137
repo:
@@ -15243,6 +15257,10 @@ spec:
1524315257
type: string
1524415258
insecure:
1524515259
type: boolean
15260+
labels:
15261+
items:
15262+
type: string
15263+
type: array
1524615264
owner:
1524715265
type: string
1524815266
repo:
@@ -17716,3 +17734,4 @@ spec:
1771617734
subresources:
1771717735
status: {}
1771817736
{{- end }}
17737+

‎charts/argo-cd/templates/crds/crd-project.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ spec:
9595
type: array
9696
description:
9797
description: Description contains optional project description
98+
maxLength: 255
9899
type: string
99100
destinationServiceAccounts:
100101
description: DestinationServiceAccounts holds information about the
@@ -305,6 +306,11 @@ spec:
305306
items:
306307
type: string
307308
type: array
309+
description:
310+
description: Description of the sync that will be applied to
311+
the schedule, can be used to add any information such as a
312+
ticket number for example
313+
type: string
308314
duration:
309315
description: Duration is the amount of time the sync window
310316
will be open
@@ -370,3 +376,4 @@ spec:
370376
served: true
371377
storage: true
372378
{{- end }}
379+

0 commit comments

Comments
 (0)