From 55b8b34d20ebaf38fa05e1113daf30220d11e725 Mon Sep 17 00:00:00 2001
From: Nick Fisher <nxf5025@gmail.com>
Date: Wed, 26 Oct 2022 21:04:37 -0400
Subject: [PATCH] fix(argo-workflows): serviceaccount rbac when sso is enabled
 (#1586)

Signed-off-by: Nick Fisher <nxf5025@gmail.com>

Signed-off-by: Nick Fisher <nxf5025@gmail.com>
---
 charts/argo-workflows/Chart.yaml                            | 4 ++--
 .../controller/workflow-controller-config-map.yaml          | 4 ----
 .../templates/server/server-cluster-roles.yaml              | 6 +++---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/charts/argo-workflows/Chart.yaml b/charts/argo-workflows/Chart.yaml
index 0c3dbf47..72940816 100644
--- a/charts/argo-workflows/Chart.yaml
+++ b/charts/argo-workflows/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: v3.4.2
 name: argo-workflows
 description: A Helm chart for Argo Workflows
 type: application
-version: 0.20.4
+version: 0.20.5
 icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
 sources:
@@ -13,4 +13,4 @@ maintainers:
     url: https://argoproj.github.io/
 annotations:
   artifacthub.io/changes: |
-    - "[Changed]: Enable to set different imagePullPolicy for mainContainer and executor"
+    - "[Fixed]: Removed invalid rbac block from configmap"
diff --git a/charts/argo-workflows/templates/controller/workflow-controller-config-map.yaml b/charts/argo-workflows/templates/controller/workflow-controller-config-map.yaml
index 0e79514c..07b47d03 100644
--- a/charts/argo-workflows/templates/controller/workflow-controller-config-map.yaml
+++ b/charts/argo-workflows/templates/controller/workflow-controller-config-map.yaml
@@ -131,10 +131,6 @@ data:
         name: {{ .clientSecret.name }}
         key: {{ .clientSecret.key }}
       redirectUrl: {{ .redirectUrl }}
-      {{- with .rbac }}
-      rbac:
-        enabled: {{ .enabled }}
-      {{- end }}
       {{- if .scopes }}
       scopes: {{ toYaml .scopes | nindent 8 }}
       {{- end }}
diff --git a/charts/argo-workflows/templates/server/server-cluster-roles.yaml b/charts/argo-workflows/templates/server/server-cluster-roles.yaml
index 66944647..c3c4e688 100644
--- a/charts/argo-workflows/templates/server/server-cluster-roles.yaml
+++ b/charts/argo-workflows/templates/server/server-cluster-roles.yaml
@@ -30,7 +30,7 @@ rules:
   - list
   - watch
   - delete
-  {{- if .Values.server.sso }}
+{{- if .Values.server.sso }}
 - apiGroups:
   - ""
   resources:
@@ -46,7 +46,7 @@ rules:
   - secrets
   verbs:
   - create
-    {{- if .Values.server.sso.rbac }}
+  {{- if .Values.server.sso.rbac }}
 - apiGroups:
   - ""
   resources:
@@ -55,8 +55,8 @@ rules:
   - get
   - list
   - watch
-    {{- end }}
   {{- end }}
+{{- end }}
 - apiGroups:
   - ""
   resources: