From e4cb104a54aeadfc41ef12741fff2ca39c576931 Mon Sep 17 00:00:00 2001
From: Vlad Losev <vladimir.losev@sage.com>
Date: Fri, 15 May 2020 14:02:37 -0700
Subject: [PATCH] Renames roles and bindings for clarity.

---
 charts/argo/templates/server-cluster-roles.yaml        |  4 ++--
 charts/argo/templates/server-crb.yaml                  | 10 +++++-----
 .../templates/workflow-controller-cluster-roles.yaml   |  4 ++--
 charts/argo/templates/workflow-controller-crb.yaml     |  8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/charts/argo/templates/server-cluster-roles.yaml b/charts/argo/templates/server-cluster-roles.yaml
index 67ee9fbc..8da10df2 100644
--- a/charts/argo/templates/server-cluster-roles.yaml
+++ b/charts/argo/templates/server-cluster-roles.yaml
@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ .Release.Name }}-{{ .Values.server.name }}-cluster-role
+  name: {{ .Release.Name }}-{{ .Values.server.name }}
 rules:
 - apiGroups:
   - ""
@@ -64,7 +64,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ .Release.Name }}-{{ .Values.server.name }}-cluster-template-cluster-role
+  name: {{ .Release.Name }}-{{ .Values.server.name }}-cluster-template
 rules:
 - apiGroups:
   - argoproj.io
diff --git a/charts/argo/templates/server-crb.yaml b/charts/argo/templates/server-crb.yaml
index a448407a..a919e573 100644
--- a/charts/argo/templates/server-crb.yaml
+++ b/charts/argo/templates/server-crb.yaml
@@ -3,16 +3,16 @@ apiVersion: rbac.authorization.k8s.io/v1
 {{- if .Values.singleNamespace }}
 kind: RoleBinding
 metadata:
-  name: {{ .Release.Name }}-{{ .Values.server.name}}-role-binding
+  name: {{ .Release.Name }}-{{ .Values.server.name}}
 {{ else }}
 kind: ClusterRoleBinding
 metadata:
-  name: {{ .Release.Name }}-{{ .Values.server.name}}-crb
+  name: {{ .Release.Name }}-{{ .Values.server.name}}
 {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ .Release.Name }}-{{ .Values.server.name}}-cluster-role
+  name: {{ .Release.Name }}-{{ .Values.server.name}}
 subjects:
 - kind: ServiceAccount
   name: {{ .Values.server.serviceAccount }}
@@ -21,11 +21,11 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ .Release.Name }}-{{ .Values.server.name}}-cluster-template-crb
+  name: {{ .Release.Name }}-{{ .Values.server.name}}-cluster-template
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ .Release.Name }}-{{ .Values.server.name}}-cluster-template-cluster-role
+  name: {{ .Release.Name }}-{{ .Values.server.name}}-cluster-template
 subjects:
 - kind: ServiceAccount
   name: {{ .Values.server.serviceAccount }}
diff --git a/charts/argo/templates/workflow-controller-cluster-roles.yaml b/charts/argo/templates/workflow-controller-cluster-roles.yaml
index 1a1deeb3..1bee0b17 100644
--- a/charts/argo/templates/workflow-controller-cluster-roles.yaml
+++ b/charts/argo/templates/workflow-controller-cluster-roles.yaml
@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-role
+  name: {{ .Release.Name }}-{{ .Values.controller.name }}
 rules:
 - apiGroups:
   - ""
@@ -101,7 +101,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-template-cluster-role
+  name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-template
 rules:
 - apiGroups:
   - argoproj.io
diff --git a/charts/argo/templates/workflow-controller-crb.yaml b/charts/argo/templates/workflow-controller-crb.yaml
index 16c3b720..459a3c67 100644
--- a/charts/argo/templates/workflow-controller-crb.yaml
+++ b/charts/argo/templates/workflow-controller-crb.yaml
@@ -5,11 +5,11 @@ kind: RoleBinding
 kind: ClusterRoleBinding
 {{- end }}
 metadata:
-  name: {{ .Release.Name }}-{{ .Values.controller.name }}-role-binding
+  name: {{ .Release.Name }}-{{ .Values.controller.name }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-role
+  name: {{ .Release.Name }}-{{ .Values.controller.name }}
 subjects:
   - kind: ServiceAccount
     name: {{ .Values.controller.serviceAccount }}
@@ -29,11 +29,11 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-template-crb
+  name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-template
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-template-cluster-role
+  name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-template
 subjects:
   - kind: ServiceAccount
     name: {{ .Values.controller.serviceAccount }}