feat: upgrade tekton triggers to v1beta1 (#1044)

Signed-off-by: Harikrishnan Balagopal <harikrishmenon@gmail.com>
konveyor · Jun 10, 2023 · f3a166d · f3a166d
1 parent d28877e
commit f3a166d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/transformer/kubernetes/apiresource/eventlistener.go b/transformer/kubernetes/apiresource/eventlistener.go
@@ -20,7 +20,7 @@ import (
 	"github.com/konveyor/move2kube/common"
 	collecttypes "github.com/konveyor/move2kube/types/collection"
 	irtypes "github.com/konveyor/move2kube/types/ir"
-	triggersv1alpha1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1"
+	triggersv1beta1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
@@ -51,21 +51,21 @@ func (el *EventListener) createNewResources(ir irtypes.EnhancedIR, supportedKind
 }
 
 // createNewResources creates the runtime objects from the intermediate representation.
-func (el *EventListener) createNewResource(ireventlistener irtypes.EventListener, targetCluster collecttypes.ClusterMetadata) *triggersv1alpha1.EventListener {
-	eventListener := new(triggersv1alpha1.EventListener)
+func (el *EventListener) createNewResource(ireventlistener irtypes.EventListener, targetCluster collecttypes.ClusterMetadata) *triggersv1beta1.EventListener {
+	eventListener := new(triggersv1beta1.EventListener)
 	eventListener.TypeMeta = metav1.TypeMeta{
 		Kind:       eventListenerKind,
-		APIVersion: triggersv1alpha1.SchemeGroupVersion.String(),
+		APIVersion: triggersv1beta1.SchemeGroupVersion.String(),
 	}
 	eventListener.ObjectMeta = metav1.ObjectMeta{Name: ireventlistener.Name}
-	eventListener.Spec = triggersv1alpha1.EventListenerSpec{
+	eventListener.Spec = triggersv1beta1.EventListenerSpec{
 		ServiceAccountName: ireventlistener.ServiceAccountName,
-		Triggers: []triggersv1alpha1.EventListenerTrigger{
+		Triggers: []triggersv1beta1.EventListenerTrigger{
 			{
-				Bindings: []*triggersv1alpha1.EventListenerBinding{
+				Bindings: []*triggersv1beta1.EventListenerBinding{
 					{Ref: ireventlistener.TriggerBindingName},
 				},
-				Template: &triggersv1alpha1.EventListenerTemplate{
+				Template: &triggersv1beta1.EventListenerTemplate{
 					Ref: &ireventlistener.TriggerTemplateName,
 				},
 			},

diff --git a/transformer/kubernetes/apiresource/triggerbinding.go b/transformer/kubernetes/apiresource/triggerbinding.go
@@ -20,7 +20,7 @@ import (
 	"github.com/konveyor/move2kube/common"
 	collecttypes "github.com/konveyor/move2kube/types/collection"
 	irtypes "github.com/konveyor/move2kube/types/ir"
-	triggersv1alpha1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1"
+	triggersv1beta1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
@@ -31,7 +31,7 @@ type TriggerBinding struct {
 
 // getSupportedKinds returns the kinds that this type supports.
 func (*TriggerBinding) getSupportedKinds() []string {
-	return []string{string(triggersv1alpha1.NamespacedTriggerBindingKind)}
+	return []string{string(triggersv1beta1.NamespacedTriggerBindingKind)}
 }
 
 // createNewResources creates the runtime objects from the intermediate representation.
@@ -47,11 +47,11 @@ func (tb *TriggerBinding) createNewResources(ir irtypes.EnhancedIR, supportedKin
 }
 
 // createNewResources creates the runtime objects from the intermediate representation.
-func (*TriggerBinding) createNewResource(irtriggerbinding irtypes.TriggerBinding) *triggersv1alpha1.TriggerBinding {
-	triggerBinding := new(triggersv1alpha1.TriggerBinding)
+func (*TriggerBinding) createNewResource(irtriggerbinding irtypes.TriggerBinding) *triggersv1beta1.TriggerBinding {
+	triggerBinding := new(triggersv1beta1.TriggerBinding)
 	triggerBinding.TypeMeta = metav1.TypeMeta{
-		Kind:       string(triggersv1alpha1.NamespacedTriggerBindingKind),
-		APIVersion: triggersv1alpha1.SchemeGroupVersion.String(),
+		Kind:       string(triggersv1beta1.NamespacedTriggerBindingKind),
+		APIVersion: triggersv1beta1.SchemeGroupVersion.String(),
 	}
 	triggerBinding.ObjectMeta = metav1.ObjectMeta{Name: irtriggerbinding.Name}
 	return triggerBinding

diff --git a/transformer/kubernetes/apiresource/triggertemplate.go b/transformer/kubernetes/apiresource/triggertemplate.go
@@ -22,7 +22,7 @@ import (
 	irtypes "github.com/konveyor/move2kube/types/ir"
 	"github.com/konveyor/move2kube/types/qaengine/commonqa"
 	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
-	triggersv1alpha1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1"
+	triggersv1beta1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -56,7 +56,7 @@ func (tt *TriggerTemplate) createNewResources(ir irtypes.EnhancedIR, supportedKi
 	return objs
 }
 
-func (*TriggerTemplate) createNewResource(tt irtypes.TriggerTemplate, ir irtypes.EnhancedIR) *triggersv1alpha1.TriggerTemplate {
+func (*TriggerTemplate) createNewResource(tt irtypes.TriggerTemplate, ir irtypes.EnhancedIR) *triggersv1beta1.TriggerTemplate {
 	registryURL := commonqa.ImageRegistry()
 	registryNamespace := commonqa.ImageRegistryNamespace()
 
@@ -89,15 +89,15 @@ func (*TriggerTemplate) createNewResource(tt irtypes.TriggerTemplate, ir irtypes
 	}
 
 	// trigger template
-	triggerTemplate := new(triggersv1alpha1.TriggerTemplate)
+	triggerTemplate := new(triggersv1beta1.TriggerTemplate)
 	triggerTemplate.TypeMeta = metav1.TypeMeta{
 		Kind:       triggerTemplateKind,
-		APIVersion: triggersv1alpha1.SchemeGroupVersion.String(),
+		APIVersion: triggersv1beta1.SchemeGroupVersion.String(),
 	}
 	triggerTemplate.ObjectMeta = metav1.ObjectMeta{Name: tt.Name}
 
-	triggerTemplate.Spec = triggersv1alpha1.TriggerTemplateSpec{
-		ResourceTemplates: []triggersv1alpha1.TriggerResourceTemplate{
+	triggerTemplate.Spec = triggersv1beta1.TriggerTemplateSpec{
+		ResourceTemplates: []triggersv1beta1.TriggerResourceTemplate{
 			{
 				RawExtension: runtime.RawExtension{Object: pipelineRun},
 			},

diff --git a/transformer/kubernetes/tektontransformer.go b/transformer/kubernetes/tektontransformer.go
@@ -35,7 +35,7 @@ import (
 	"github.com/konveyor/move2kube/types/transformer/artifacts"
 	"github.com/sirupsen/logrus"
 	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
-	triggersv1alpha1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1"
+	triggersv1beta1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1"
 	core "k8s.io/kubernetes/pkg/apis/core"
 	"k8s.io/kubernetes/pkg/apis/networking"
 )
@@ -244,7 +244,7 @@ func (t *Tekton) setupEnhancedIR(oldir irtypes.IR, name string) irtypes.Enhanced
 	ir.Roles = append(ir.Roles, irtypes.Role{
 		Name: tektonTriggersAdminRoleName,
 		PolicyRules: []irtypes.PolicyRule{
-			{APIGroups: []string{triggersv1alpha1.SchemeGroupVersion.Group}, Resources: []string{"eventlisteners", "triggerbindings", "triggertemplates"}, Verbs: []string{"get"}},
+			{APIGroups: []string{triggersv1beta1.SchemeGroupVersion.Group}, Resources: []string{"eventlisteners", "triggerbindings", "triggertemplates"}, Verbs: []string{"get"}},
 			{APIGroups: []string{v1beta1.SchemeGroupVersion.Group}, Resources: []string{"pipelineruns"}, Verbs: []string{"create"}},
 			{APIGroups: []string{""}, Resources: []string{"configmaps"}, Verbs: []string{"get", "list", "watch"}},
 		},