From 3809be02dcdde66c9281c0ed819bd026d8fe0988 Mon Sep 17 00:00:00 2001 From: Boris Smidt Date: Mon, 21 Aug 2023 17:11:28 +0200 Subject: [PATCH] Use the clusterAdminAccess setting now to enable the cluster role binding of the applicaitonset controller. Signed-off-by: Boris Smidt Signed-off-by: Boris Smidt --- charts/argo-cd/Chart.yaml | 2 +- .../argocd-application-controller/clusterrolebinding.yaml | 3 +-- .../argo-cd/templates/argocd-applicationset/clusterrole.yaml | 3 +-- .../templates/argocd-applicationset/clusterrolebinding.yaml | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 3fcec8e6..0fd8345e 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -27,4 +27,4 @@ annotations: url: https://argoproj.github.io/argo-helm/pgp_keys.asc artifacthub.io/changes: | - kind: fixed - description: Add a cluster role to make namespaced application set controller work. + description: clusterAdminAccess now creates a cluster role for thhe applicationset controller to support multiple namespaces diff --git a/charts/argo-cd/templates/argocd-application-controller/clusterrolebinding.yaml b/charts/argo-cd/templates/argocd-application-controller/clusterrolebinding.yaml index 39ee80a6..9d61b77f 100644 --- a/charts/argo-cd/templates/argocd-application-controller/clusterrolebinding.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/clusterrolebinding.yaml @@ -1,5 +1,4 @@ -{{- $config := .Values.controller.clusterAdminAccess | default dict -}} -{{- if hasKey $config "enabled" | ternary $config.enabled .Values.createClusterRoles }} +{{- if .Values.createClusterRoles }} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: diff --git a/charts/argo-cd/templates/argocd-applicationset/clusterrole.yaml b/charts/argo-cd/templates/argocd-applicationset/clusterrole.yaml index 82b83fcf..692b57c7 100644 --- a/charts/argo-cd/templates/argocd-applicationset/clusterrole.yaml +++ b/charts/argo-cd/templates/argocd-applicationset/clusterrole.yaml @@ -1,5 +1,4 @@ -{{- $config := .Values.controller.clusterAdminAccess | default dict -}} -{{- if hasKey $config "enabled" | ternary $config.enabled .Values.createClusterRoles }} +{{- if .Values.createClusterRoles }} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: diff --git a/charts/argo-cd/templates/argocd-applicationset/clusterrolebinding.yaml b/charts/argo-cd/templates/argocd-applicationset/clusterrolebinding.yaml index 63cd1075..e6ebc222 100644 --- a/charts/argo-cd/templates/argocd-applicationset/clusterrolebinding.yaml +++ b/charts/argo-cd/templates/argocd-applicationset/clusterrolebinding.yaml @@ -1,4 +1,4 @@ -{{- $config := .Values.controller.clusterAdminAccess | default dict -}} +{{- $config := .Values.applicationSet.clusterRole | default dict -}} {{- if hasKey $config "enabled" | ternary $config.enabled .Values.createClusterRoles }} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding