Skip to content

feat(argo-cd): add custom roleRules support for application-controller #3500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mbevc1 merged 4 commits into from
Sep 20, 2025
Merged

feat(argo-cd): add custom roleRules support for application-controller #3500

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a93854f
feat(argo-cd): add custom roleRules support for application-controller
puretension Sep 19, 2025
fd6f337
fix: remove enabled flag and use with pattern for roleRules
puretension Sep 19, 2025
d56d91f
docs: update roleRules documentation structure
puretension Sep 19, 2025
455e240
Update charts/argo-cd/templates/argocd-application-controller/role.yaml
puretension Sep 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions charts/argo-cd/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ appVersion: v3.1.6
kubeVersion: ">=1.25.0-0"
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd
version: 8.5.2
version: 8.5.3
home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
sources:
Expand All @@ -26,5 +26,5 @@ annotations:
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
artifacthub.io/changes: |
- kind: changed
description: Bump argo-cd to v3.1.6
- kind: added
description: Add custom roleRules support for application-controller Role resource
2 changes: 2 additions & 0 deletions charts/argo-cd/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -941,6 +941,8 @@ NAME: my-release
| controller.replicas | int | `1` | The number of application controller pods to run. Additional replicas will cause sharding of managed clusters across number of replicas. |
| controller.resources | object | `{}` | Resource limits and requests for the application controller pods |
| controller.revisionHistoryLimit | int | `5` | Maximum number of controller revisions that will be maintained in StatefulSet history |
| controller.roleRules.enabled | bool | `false` | Enable custom rules for the application controller's Role resource |
| controller.roleRules.rules | list | `[]` | List of custom rules for the application controller's Role resource |
| controller.runtimeClassName | string | `""` (defaults to global.runtimeClassName) | Runtime class name for the application controller |
| controller.serviceAccount.annotations | object | `{}` | Annotations applied to created service account |
| controller.serviceAccount.automountServiceAccountToken | bool | `true` | Automount API credentials for the Service Account |
Expand Down
4 changes: 4 additions & 0 deletions charts/argo-cd/templates/argocd-application-controller/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ metadata:
labels:
{{- include "argo-cd.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
rules:
{{- if .Values.controller.roleRules.enabled }}
{{- toYaml .Values.controller.roleRules.rules | nindent 2 }}
{{- else }}
- apiGroups:
- ""
resources:
Expand Down Expand Up @@ -58,3 +61,4 @@ rules:
- create
- update
{{- end }}
{{- end }}
8 changes: 8 additions & 0 deletions charts/argo-cd/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1140,6 +1140,14 @@ controller:
# -- List of custom rules for the application controller's ClusterRole resource
rules: []

## Enable this and set the rules: to whatever custom rules you want for the Role resource.
## Defaults to off
roleRules:
# -- Enable custom rules for the application controller's Role resource
enabled: false
Copy link
Collaborator

@yu-croco yu-croco Sep 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can remove the enabled flag now.

Copy link
Contributor Author

@puretension puretension Sep 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you I'm on it!

# -- List of custom rules for the application controller's Role resource
rules: []

# Default application controller's network policy
networkPolicy:
# -- Default network policy rules used by application controller
Expand Down