From ec68ef2080d03c68dcd2604b1c9ed8f5d979fee4 Mon Sep 17 00:00:00 2001
From: John Kost <41963650+johnkost@users.noreply.github.com>
Date: Tue, 9 Feb 2021 12:32:28 -0500
Subject: [PATCH] feat(argo-cd): conditionally create the rbac configmap (#569)

Signed-off-by: John Kost <jkost@bandwidth.com>
---
 charts/argo-cd/Chart.yaml                                   | 2 +-
 charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml | 4 +++-
 charts/argo-cd/values.yaml                                  | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 3d447531..21476976 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 1.7.11
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 2.12.0
+version: 2.13.0
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:
diff --git a/charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml b/charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml
index 8bbb7a93..8b7edd55 100644
--- a/charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml
+++ b/charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml
@@ -1,3 +1,4 @@
+{{-  if .Values.server.rbacConfigCreate }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -18,4 +19,5 @@ metadata:
 {{- if .Values.server.rbacConfig }}
 data:
 {{- toYaml .Values.server.rbacConfig | nindent 4 }}
-{{- end }}
\ No newline at end of file
+{{- end }}
+{{- end }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 7e8d00f3..8ec409e9 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -595,6 +595,10 @@ server:
   ## Annotations to be added to ArgoCD rbac ConfigMap
   rbacConfigAnnotations: {}
 
+  # Boolean determining whether or not to create the configmap. If false, it is expected tthe configmap will be created
+  # by something else. ArgoCD will not work if there is no configMap created with the name above.
+  rbacConfigCreate: true
+
   ## Not well tested and not well supported on release v1.0.0.
   ## Applications
   ## reference: https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/