From 310d08e1322766c81da7304ed001d2f1bebeafaa Mon Sep 17 00:00:00 2001 From: Claudia Yan Date: Mon, 15 Jun 2020 17:31:36 -0400 Subject: [PATCH] changes after tim talk --- config/orchestrations/cli-services/0.2/kabanero-cli.yaml | 2 +- deploy/kabanero-customresources.yaml | 7 ++----- pkg/controller/kabaneroplatform/targetnamespaces.go | 1 - 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/config/orchestrations/cli-services/0.2/kabanero-cli.yaml b/config/orchestrations/cli-services/0.2/kabanero-cli.yaml index 5194d34c..de1f2015 100644 --- a/config/orchestrations/cli-services/0.2/kabanero-cli.yaml +++ b/config/orchestrations/cli-services/0.2/kabanero-cli.yaml @@ -89,7 +89,7 @@ rules: verbs: - '*' - apiGroups: - - kabanero.io + - apps resources: - deployments verbs: diff --git a/deploy/kabanero-customresources.yaml b/deploy/kabanero-customresources.yaml index 9664274f..34924633 100644 --- a/deploy/kabanero-customresources.yaml +++ b/deploy/kabanero-customresources.yaml @@ -565,13 +565,10 @@ metadata: namespace: kabanero labels: kabanero.io/install: 27-cli-service-role -subjects: -- kind: ServiceAccount -- name: kabanero-cli -- namespace: kabanero rules: - apiGroups: - - rbac.authorization.k8s.io + - extensions + - apps resources: - deployments verbs: diff --git a/pkg/controller/kabaneroplatform/targetnamespaces.go b/pkg/controller/kabaneroplatform/targetnamespaces.go index f7449253..be6b2191 100644 --- a/pkg/controller/kabaneroplatform/targetnamespaces.go +++ b/pkg/controller/kabaneroplatform/targetnamespaces.go @@ -69,7 +69,6 @@ func createBindingTemplates(saNamespace string) []targetNamespaceRoleBindingTemp saNamespace: saNamespace, clusterRoleName: "kabanero-pipeline-deploy-role", }, - // TODO: Second role binding for CLI service { name: "kabanero-cli-deploy-rolebinding", saName: "kabanero-cli",