From 83d91e2e9cd6ee827d0ee9764cd4e174662f08c9 Mon Sep 17 00:00:00 2001 From: Vlad Losev Date: Fri, 15 May 2020 10:36:31 -0700 Subject: [PATCH] fix:ClusterTemplateWorkflow access fix. --- charts/argo/templates/server-cluster-role.yaml | 6 ------ charts/argo/templates/server-crb.yaml | 5 ----- .../argo/templates/workflow-controller-clusterrole.yaml | 8 -------- charts/argo/templates/workflow-controller-crb.yaml | 5 ----- 4 files changed, 24 deletions(-) diff --git a/charts/argo/templates/server-cluster-role.yaml b/charts/argo/templates/server-cluster-role.yaml index 082e4915..45a195ba 100644 --- a/charts/argo/templates/server-cluster-role.yaml +++ b/charts/argo/templates/server-cluster-role.yaml @@ -1,14 +1,8 @@ {{- if .Values.server.enabled }} apiVersion: rbac.authorization.k8s.io/v1 -{{- if .Values.singleNamespace }} -kind: Role -metadata: - name: {{ .Release.Name }}-{{ .Values.server.name }}-role -{{ else }} kind: ClusterRole metadata: name: {{ .Release.Name }}-{{ .Values.server.name }}-cluster-role -{{- end }} rules: - apiGroups: - "" diff --git a/charts/argo/templates/server-crb.yaml b/charts/argo/templates/server-crb.yaml index ed7d7982..bab4fa4c 100644 --- a/charts/argo/templates/server-crb.yaml +++ b/charts/argo/templates/server-crb.yaml @@ -11,13 +11,8 @@ metadata: {{- end }} roleRef: apiGroup: rbac.authorization.k8s.io - {{- if .Values.singleNamespace }} - kind: Role - name: {{ .Release.Name }}-{{ .Values.server.name}}-role - {{ else }} kind: ClusterRole name: {{ .Release.Name }}-{{ .Values.server.name}}-cluster-role - {{- end }} subjects: - kind: ServiceAccount name: {{ .Values.server.serviceAccount }} diff --git a/charts/argo/templates/workflow-controller-clusterrole.yaml b/charts/argo/templates/workflow-controller-clusterrole.yaml index 43d1a8a7..c8c1b3d4 100644 --- a/charts/argo/templates/workflow-controller-clusterrole.yaml +++ b/charts/argo/templates/workflow-controller-clusterrole.yaml @@ -1,13 +1,7 @@ apiVersion: rbac.authorization.k8s.io/v1 -{{- if .Values.singleNamespace }} -kind: Role -metadata: - name: {{ .Release.Name }}-{{ .Values.controller.name }}-role -{{ else }} kind: ClusterRole metadata: name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-role -{{- end }} rules: - apiGroups: - "" @@ -103,5 +97,3 @@ rules: verbs: - get {{- end}} - - diff --git a/charts/argo/templates/workflow-controller-crb.yaml b/charts/argo/templates/workflow-controller-crb.yaml index 3eba3cf2..fb9ab10d 100644 --- a/charts/argo/templates/workflow-controller-crb.yaml +++ b/charts/argo/templates/workflow-controller-crb.yaml @@ -8,13 +8,8 @@ metadata: name: {{ .Release.Name }}-{{ .Values.controller.name }}-binding roleRef: apiGroup: rbac.authorization.k8s.io - {{- if .Values.singleNamespace }} - kind: Role - name: {{ .Release.Name }}-{{ .Values.controller.name }}-role - {{ else }} kind: ClusterRole name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-role - {{- end }} subjects: - kind: ServiceAccount name: {{ .Values.controller.serviceAccount }}