From 556011dd4d764eb8c11a8d41eb9526e67e6c186e Mon Sep 17 00:00:00 2001 From: Vlad Losev Date: Wed, 24 Feb 2021 08:36:16 -0800 Subject: [PATCH 1/3] fix(argo): Restore cluster template role binding to be ClusterRoleBinding. (#593) Signed-off-by: Vlad Losev --- charts/argo/Chart.yaml | 2 +- charts/argo/templates/workflow-controller-crb.yaml | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 2353232f..0fe8f038 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v2.12.5 description: A Helm chart for Argo Workflows name: argo -version: 0.16.2 +version: 0.16.3 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png home: https://github.com/argoproj/argo-helm maintainers: diff --git a/charts/argo/templates/workflow-controller-crb.yaml b/charts/argo/templates/workflow-controller-crb.yaml index 5e171155..66cca4d0 100644 --- a/charts/argo/templates/workflow-controller-crb.yaml +++ b/charts/argo/templates/workflow-controller-crb.yaml @@ -31,20 +31,12 @@ subjects: {{- end }} --- apiVersion: rbac.authorization.k8s.io/v1 -{{- if .Values.singleNamespace }} -kind: RoleBinding -{{ else }} kind: ClusterRoleBinding -{{- end }} metadata: name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-template roleRef: apiGroup: rbac.authorization.k8s.io - {{- if .Values.singleNamespace }} - kind: Role - {{ else }} kind: ClusterRole - {{- end }} name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-template subjects: - kind: ServiceAccount From 528b4d054b1ba8f850aee5b91eb88e4bf1a6933a Mon Sep 17 00:00:00 2001 From: Vlad Losev Date: Wed, 24 Feb 2021 09:43:27 -0800 Subject: [PATCH 2/3] fix(argo): Restore server cluster-template to be a ClusterRoleBinding. (#594) Signed-off-by: Vlad Losev --- charts/argo/Chart.yaml | 2 +- charts/argo/templates/server-cluster-roles.yaml | 4 ---- charts/argo/templates/server-crb.yaml | 8 -------- .../argo/templates/workflow-controller-cluster-roles.yaml | 4 ---- 4 files changed, 1 insertion(+), 17 deletions(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 0fe8f038..12c33ef0 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v2.12.5 description: A Helm chart for Argo Workflows name: argo -version: 0.16.3 +version: 0.16.4 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png home: https://github.com/argoproj/argo-helm maintainers: diff --git a/charts/argo/templates/server-cluster-roles.yaml b/charts/argo/templates/server-cluster-roles.yaml index 3000c129..85ce605d 100644 --- a/charts/argo/templates/server-cluster-roles.yaml +++ b/charts/argo/templates/server-cluster-roles.yaml @@ -111,11 +111,7 @@ rules: - delete --- apiVersion: rbac.authorization.k8s.io/v1 -{{- if .Values.singleNamespace }} -kind: Role -{{- else }} kind: ClusterRole -{{- end }} metadata: name: {{ .Release.Name }}-{{ .Values.server.name }}-cluster-template rules: diff --git a/charts/argo/templates/server-crb.yaml b/charts/argo/templates/server-crb.yaml index 44467c7c..ad4cfeda 100644 --- a/charts/argo/templates/server-crb.yaml +++ b/charts/argo/templates/server-crb.yaml @@ -21,20 +21,12 @@ subjects: namespace: {{ .Release.Namespace }} --- apiVersion: rbac.authorization.k8s.io/v1 -{{- if .Values.singleNamespace }} -kind: RoleBinding -{{ else }} kind: ClusterRoleBinding -{{- end }} metadata: name: {{ .Release.Name }}-{{ .Values.server.name}}-cluster-template roleRef: apiGroup: rbac.authorization.k8s.io - {{- if .Values.singleNamespace }} - kind: Role - {{ else }} kind: ClusterRole - {{- end }} name: {{ .Release.Name }}-{{ .Values.server.name}}-cluster-template subjects: - kind: ServiceAccount diff --git a/charts/argo/templates/workflow-controller-cluster-roles.yaml b/charts/argo/templates/workflow-controller-cluster-roles.yaml index e5590060..4d596b1c 100644 --- a/charts/argo/templates/workflow-controller-cluster-roles.yaml +++ b/charts/argo/templates/workflow-controller-cluster-roles.yaml @@ -131,11 +131,7 @@ rules: - delete --- apiVersion: rbac.authorization.k8s.io/v1 -{{- if .Values.singleNamespace }} -kind: Role -{{- else }} kind: ClusterRole -{{- end }} metadata: name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-template rules: From 0ccdad07aee23c5b35338476f9f37728e97b5238 Mon Sep 17 00:00:00 2001 From: Vlad Losev Date: Wed, 24 Feb 2021 11:03:55 -0800 Subject: [PATCH 3/3] fix(argo): @vladlosev Restores aggregated roles to be ClusterRoles. (#595) * Restores aggregated roles to be ClusterRoles. Signed-off-by: Vlad Losev * Bumps chart version. Signed-off-by: Vlad Losev --- charts/argo/Chart.yaml | 2 +- charts/argo/templates/workflow-aggregate-roles.yaml | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 12c33ef0..38d5718d 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v2.12.5 description: A Helm chart for Argo Workflows name: argo -version: 0.16.4 +version: 0.16.5 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png home: https://github.com/argoproj/argo-helm maintainers: diff --git a/charts/argo/templates/workflow-aggregate-roles.yaml b/charts/argo/templates/workflow-aggregate-roles.yaml index 168dd862..fd0526ac 100644 --- a/charts/argo/templates/workflow-aggregate-roles.yaml +++ b/charts/argo/templates/workflow-aggregate-roles.yaml @@ -1,10 +1,5 @@ {{- if .Values.createAggregateRoles }} -apiVersion: rbac.authorization.k8s.io/v1 -{{- if .Values.singleNamespace }} -kind: Role -{{ else }} kind: ClusterRole -{{- end }} metadata: annotations: helm.sh/hook: pre-install @@ -30,11 +25,7 @@ rules: - watch --- apiVersion: rbac.authorization.k8s.io/v1 -{{- if .Values.singleNamespace }} -kind: Role -{{ else }} kind: ClusterRole -{{- end }} metadata: annotations: helm.sh/hook: pre-install @@ -65,11 +56,7 @@ rules: - watch --- apiVersion: rbac.authorization.k8s.io/v1 -{{- if .Values.singleNamespace }} -kind: Role -{{ else }} kind: ClusterRole -{{- end }} metadata: annotations: helm.sh/hook: pre-install