feat(argo-cd): conditional namespace support to ClusterRoleBinding

charts/argo-cd/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: v2.12.3
 kubeVersion: ">=1.25.0-0"
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 7.6.2
+version: 7.6.3
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
@@ -26,5 +26,5 @@ annotations:
     fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
     url: https://argoproj.github.io/argo-helm/pgp_keys.asc
   artifacthub.io/changes: |
-    - kind: fixed
-      description: Remove namespace field from cluster scoped resources
+    - kind: added
+      description: Add conditional handling of multiple namespaces in ClusterRoleBinding for ApplicationSet controller.

charts/argo-cd/README.md

@@ -742,6 +742,7 @@ NAME: my-release
 | configs.gpg.keys | object | `{}` (See [values.yaml]) | [GnuPG] public keys to add to the keyring |
 | configs.params."application.namespaces" | string | `""` | Enables [Applications in any namespace] |
 | configs.params."applicationsetcontroller.enable.progressive.syncs" | bool | `false` | Enables use of the Progressive Syncs capability |
+| configs.params."applicationsetcontroller.namespaces" | string | `""` |  |
 | configs.params."applicationsetcontroller.policy" | string | `"sync"` | Modify how application is synced between the generator and the cluster. One of: `sync`, `create-only`, `create-update`, `create-delete` |
 | configs.params."controller.ignore.normalizer.jq.timeout" | string | `"1s"` | JQ Path expression timeout |
 | configs.params."controller.operation.processors" | int | `10` | Number of application operation processors |

charts/argo-cd/templates/argocd-application-controller/clusterrolebinding.yaml

@@ -13,4 +13,11 @@ subjects:
 - kind: ServiceAccount
   name: {{ include "argo-cd.controller.serviceAccountName" . }}
   namespace: {{ include "argo-cd.namespace" . }}
+{{- if .Values.configs.params.applicationsetcontroller.namespaces }}
+{{- range (split "," .Values.configs.params.applicationsetcontroller.namespaces) }}
+- kind: ServiceAccount
+  name: {{ include "argo-cd.controller.serviceAccountName" $root }}
+  namespace: {{ . | trim }}
+{{- end }}
+{{- end }}
 {{- end }}

charts/argo-cd/values.yaml

@@ -279,6 +279,10 @@ configs:
     # -- Enables use of the Progressive Syncs capability
     applicationsetcontroller.enable.progressive.syncs: false
 
+    # When specifying multiple namespaces, specify them as a comma-separated string
+    # e.g., "namespace1, namespace2"
+    applicationsetcontroller.namespaces: ""
+
     # -- Enables [Applications in any namespace]
     ## List of additional namespaces where applications may be created in and reconciled from.
     ## The namespace where Argo CD is installed to will always be allowed.