From 54cf342d44e826a95700f84ca4ef0303d1b33709 Mon Sep 17 00:00:00 2001 From: leehosu Date: Tue, 24 Sep 2024 00:26:20 +0900 Subject: [PATCH] feat: support multiple namespaces in ClusterRoleBinding using comma-separated string Signed-off-by: leehosu --- .../argocd-application-controller/clusterrolebinding.yaml | 4 ++-- charts/argo-cd/values.yaml | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/charts/argo-cd/templates/argocd-application-controller/clusterrolebinding.yaml b/charts/argo-cd/templates/argocd-application-controller/clusterrolebinding.yaml index 47974c64..00a260b0 100644 --- a/charts/argo-cd/templates/argocd-application-controller/clusterrolebinding.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/clusterrolebinding.yaml @@ -14,10 +14,10 @@ subjects: name: {{ include "argo-cd.controller.serviceAccountName" . }} namespace: {{ include "argo-cd.namespace" . }} {{- if .Values.configs.params.applicationsetcontroller.namespaces }} -{{- range .Values.configs.params.applicationsetcontroller.namespaces }} +{{- range (split "," .Values.configs.params.applicationsetcontroller.namespaces) }} - kind: ServiceAccount name: {{ include "argo-cd.controller.serviceAccountName" $root }} - namespace: {{ . }} + namespace: {{ . | trim }} {{- end }} {{- end }} {{- end }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index df2bb3a0..14dbe315 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -279,11 +279,8 @@ configs: # -- Enables use of the Progressive Syncs capability applicationsetcontroller.enable.progressive.syncs: false - # When specifying multiple namespaces, specify them in array form - applicationsetcontroller.namespaces: [] - # - namespace1 - # - namespace2 - # - namespace3 + # When specifying multiple namespaces, specify them as a comma-separated string + applicationsetcontroller.namespaces: "namespace1, namespace2" # -- Enables [Applications in any namespace] ## List of additional namespaces where applications may be created in and reconciled from.