Skip to content

Commit 34a33c9

Browse files
KENNYSOFTpdrastilyu-croco
authored
feat(argo-cd): Set aggregate roles only for using resources, with argocdextensions also (argoproj#1679)
Signed-off-by: Hyeonmin Park <[email protected]> Signed-off-by: Hyeonmin Park <[email protected]> Co-authored-by: Petr Drastil <[email protected]> Co-authored-by: Aikawa <[email protected]>
1 parent 216a52d commit 34a33c9

File tree

3 files changed

+20
-3
lines changed

3 files changed

+20
-3
lines changed

charts/argo-cd/Chart.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ appVersion: v2.5.3
33
kubeVersion: ">=1.22.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.16.0
6+
version: 5.16.1
77
home: https://github.com/argoproj/argo-helm
88
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
99
sources:
@@ -23,4 +23,6 @@ dependencies:
2323
condition: redis-ha.enabled
2424
annotations:
2525
artifacthub.io/changes: |
26-
- "[Added]: Ability to annotate Deployment and Statefulset objects for all components"
26+
- "[Fixed]: Set aggregate roles only for using resources"
27+
- "[Added]: Add argocdextensions to aggregate roles"
28+
- "[Fixed]: Fix typo of notification.bots.slack.image in values"

charts/argo-cd/templates/aggregate-roles.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@ rules:
1111
- argoproj.io
1212
resources:
1313
- applications
14+
{{- if .Values.applicationSet.enabled }}
1415
- applicationsets
16+
{{- end }}
17+
{{- if .Values.server.extensions.enabled }}
18+
- argocdextensions
19+
{{- end }}
1520
- appprojects
1621
verbs:
1722
- get
@@ -31,7 +36,12 @@ rules:
3136
- argoproj.io
3237
resources:
3338
- applications
39+
{{- if .Values.applicationSet.enabled }}
3440
- applicationsets
41+
{{- end }}
42+
{{- if .Values.server.extensions.enabled }}
43+
- argocdextensions
44+
{{- end }}
3545
- appprojects
3646
verbs:
3747
- create
@@ -56,7 +66,12 @@ rules:
5666
- argoproj.io
5767
resources:
5868
- applications
69+
{{- if .Values.applicationSet.enabled }}
5970
- applicationsets
71+
{{- end }}
72+
{{- if .Values.server.extensions.enabled }}
73+
- argocdextensions
74+
{{- end }}
6075
- appprojects
6176
verbs:
6277
- create

charts/argo-cd/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2890,7 +2890,7 @@ notifications:
28902890
## Has higher precedence over `notifications.bots.slack.pdb.minAvailable`
28912891
maxUnavailable: ""
28922892

2893-
## Slack bot imabe
2893+
## Slack bot image
28942894
image:
28952895
# -- Repository to use for the Slack bot
28962896
# @default -- `""` (defaults to global.image.repository)

0 commit comments

Comments
 (0)