Merge pull request #657 from kaczyns/triggersRBAC

tekton triggers apis moved to triggers.tekton.dev
kabanero-io · Apr 29, 2020 · 3c07d5f · 3c07d5f
2 parents 54286c9 + b9b7cd9
commit 3c07d5f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/deploy/kabanero-customresources.yaml b/deploy/kabanero-customresources.yaml
@@ -300,7 +300,7 @@ metadata:
     kabanero.io/install: 25-triggers-role
 rules:
 - apiGroups:
-  - tekton.dev
+  - triggers.tekton.dev
   resources:
   - triggerbindings
   - triggertemplates

diff --git a/pkg/controller/stack/stack_controller.go b/pkg/controller/stack/stack_controller.go
@@ -531,9 +531,9 @@ func reconcileActiveVersions(stackResource *kabanerov1alpha2.Stack, c client.Cli
 								// Only allow Group: tekton.dev
 								allowed := true
 								for _, resource := range resources {
-									if resource.GroupVersionKind().Group != "tekton.dev" {
+									if (resource.GroupVersionKind().Group != "tekton.dev") && (resource.GroupVersionKind().Group != "triggers.tekton.dev") {
 										value.ActiveAssets[index].Status = assetStatusFailed
-										value.ActiveAssets[index].StatusMessage = "Manifest rejected: contains a Group not equal to tekton.dev"
+										value.ActiveAssets[index].StatusMessage = "Manifest rejected: contains a Group not equal to tekton.dev or triggers.tekton.dev"
 										allowed = false
 									}
 								}