Update Triggers API group to match Triggers 0.4 release

jjjjijiji · Apr 7, 2020 · 0942078 · 0942078
1 parent dd4b4dd
commit 0942078
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 19 deletions.
diff --git a/base/200-clusterrole.yaml b/base/200-clusterrole.yaml
@@ -46,7 +46,7 @@ rules:
   - apiGroups: ["dashboard.tekton.dev"]
     resources: ["extensions"]
     verbs: ["get", "list", "watch"]
-  - apiGroups: ["tekton.dev"]
-    resources: ["eventlisteners", "triggerbindings",
-                "triggertemplates"]
+  - apiGroups: ["triggers.tekton.dev"]
+    resources: ["clustertriggerbindings", "eventlisteners",
+                "triggerbindings", "triggertemplates"]
     verbs: ["get", "list", "watch"]
diff --git a/overlays/full-fat/cluster-role-patch-json.yaml b/overlays/full-fat/cluster-role-patch-json.yaml
@@ -110,8 +110,9 @@
   path: /rules/8
   value:
     apiGroups:
-      - tekton.dev
+      - triggers.tekton.dev
     resources:
+      - clustertriggerbindings
       - eventlisteners
       - triggerbindings
       - triggertemplates

diff --git a/src/api/index.js b/src/api/index.js
@@ -22,7 +22,7 @@ import {
 } from './comms';
 
 const tektonAPIGroup = 'tekton.dev';
-const triggersAPIGroup = 'tekton.dev'; // TODO: update to 'triggers.tekton.dev' for Triggers 0.4
+const triggersAPIGroup = 'triggers.tekton.dev';
 
 export function getAPIRoot() {
   const { href, hash } = window.location;

diff --git a/src/containers/ClusterTriggerBinding/ClusterTriggerBinding.test.js b/src/containers/ClusterTriggerBinding/ClusterTriggerBinding.test.js
@@ -27,7 +27,7 @@ const intl = createIntl({
 });
 
 const clusterTriggerBindingSimple = {
-  apiVersion: 'tekton.dev/v1alpha1',
+  apiVersion: 'triggers.tekton.dev/v1alpha1',
   kind: 'ClusterTriggerBinding',
   metadata: {
     creationTimestamp: '2019-11-19T19:44:43Z',
@@ -43,7 +43,7 @@ const clusterTriggerBindingSimple = {
 };
 
 const clusterTriggerBindingWithLabels = {
-  apiVersion: 'tekton.dev/v1alpha1',
+  apiVersion: 'triggers.tekton.dev/v1alpha1',
   kind: 'ClusterTriggerBinding',
   metadata: {
     labels: {

diff --git a/src/containers/ClusterTriggerBindings/ClusterTriggerBindings.test.js b/src/containers/ClusterTriggerBindings/ClusterTriggerBindings.test.js
@@ -45,7 +45,7 @@ const namespaces = {
 
 const byId = {
   'c930f02e-0582-11ea-8c1f-025765432111': {
-    apiVersion: 'tekton.dev/v1alpha1',
+    apiVersion: 'triggers.tekton.dev/v1alpha1',
     kind: 'ClusterTriggerBinding',
     metadata: {
       creationTimestamp: '2019-11-12T19:29:46Z',

diff --git a/src/containers/EventListener/EventListener.stories.js b/src/containers/EventListener/EventListener.stories.js
@@ -19,7 +19,7 @@ import { createIntl } from 'react-intl';
 import { EventListenerContainer } from './EventListener';
 
 const eventListener = {
-  apiVersion: 'tekton.dev/v1alpha1',
+  apiVersion: 'triggers.tekton.dev/v1alpha1',
   kind: 'EventListener',
   metadata: {
     name: 'my-eventlistener',

diff --git a/src/containers/EventListener/EventListener.test.js b/src/containers/EventListener/EventListener.test.js
@@ -29,7 +29,7 @@ const intl = createIntl({
 /* Displaying of Trigger info is tested in the component test */
 
 const fakeEventListenerWithLabels = {
-  apiVersion: 'tekton.dev/v1alpha1',
+  apiVersion: 'triggers.tekton.dev/v1alpha1',
   kind: 'EventListener',
   metadata: {
     name: 'tekton-webhooks-eventlistener',

diff --git a/src/containers/EventListeners/EventListeners.test.js b/src/containers/EventListeners/EventListeners.test.js
@@ -32,8 +32,8 @@ const byNamespace = {
 
 const byId = {
   'c930f02e-0582-11ea-8c1f-025765432111': {
-    apiVersion: 'tekton.dev/v1alpha1',
-    kind: 'eventListener',
+    apiVersion: 'triggers.tekton.dev/v1alpha1',
+    kind: 'EventListener',
     metadata: {
       creationTimestamp: '2019-11-12T19:29:46Z',
       name: 'event-listener',

diff --git a/src/containers/SideNav/SideNav.js b/src/containers/SideNav/SideNav.js
@@ -142,7 +142,7 @@ class SideNav extends Component {
       group: 'apiextensions.k8s.io',
       version: 'v1beta1',
       type: 'customresourcedefinitions',
-      name: 'eventlisteners.tekton.dev'
+      name: 'eventlisteners.triggers.tekton.dev'
     })
       .then(() => {
         this.setState({ isTriggersInstalled: true });

diff --git a/src/containers/TriggerBinding/TriggerBinding.test.js b/src/containers/TriggerBinding/TriggerBinding.test.js
@@ -27,7 +27,7 @@ const intl = createIntl({
 });
 
 const triggerBindingSimple = {
-  apiVersion: 'tekton.dev/v1alpha1',
+  apiVersion: 'triggers.tekton.dev/v1alpha1',
   kind: 'TriggerBinding',
   metadata: {
     creationTimestamp: '2019-11-19T19:44:43Z',
@@ -44,7 +44,7 @@ const triggerBindingSimple = {
 };
 
 const triggerBindingWithLabels = {
-  apiVersion: 'tekton.dev/v1alpha1',
+  apiVersion: 'triggers.tekton.dev/v1alpha1',
   kind: 'TriggerBinding',
   metadata: {
     labels: {

diff --git a/src/containers/TriggerBindings/TriggerBindings.test.js b/src/containers/TriggerBindings/TriggerBindings.test.js
@@ -32,7 +32,7 @@ const byNamespace = {
 
 const byId = {
   'c930f02e-0582-11ea-8c1f-025765432111': {
-    apiVersion: 'tekton.dev/v1alpha1',
+    apiVersion: 'triggers.tekton.dev/v1alpha1',
     kind: 'triggerBinding',
     metadata: {
       creationTimestamp: '2019-11-12T19:29:46Z',

diff --git a/src/containers/TriggerTemplate/TriggerTemplate.test.js b/src/containers/TriggerTemplate/TriggerTemplate.test.js
@@ -50,7 +50,7 @@ const resourceTemplate1Details = {
   }
 };
 const fakeTriggerTemplate = {
-  apiVersion: 'tekton.dev/v1alpha1',
+  apiVersion: 'triggers.tekton.dev/v1alpha1',
   kind: 'TriggerTemplate',
   metadata: {
     annotations: {
@@ -114,7 +114,7 @@ const fakeTriggerTemplate = {
 };
 
 const fakeTriggerTemplateWithLabels = {
-  apiVersion: 'tekton.dev/v1alpha1',
+  apiVersion: 'triggers.tekton.dev/v1alpha1',
   kind: 'TriggerTemplate',
   metadata: {
     annotations: {

diff --git a/src/containers/TriggerTemplates/TriggerTemplates.test.js b/src/containers/TriggerTemplates/TriggerTemplates.test.js
@@ -32,7 +32,7 @@ const byNamespace = {
 
 const byId = {
   'c930f02e-0582-11ea-8c1f-025765432111': {
-    apiVersion: 'tekton.dev/v1alpha1',
+    apiVersion: 'triggers.tekton.dev/v1alpha1',
     kind: 'TriggerTemplate',
     metadata: {
       creationTimestamp: '2019-11-12T19:29:46Z',