Switch reconciler & sink to using v1beta1 types

The reconciler and sink code now use v1beta1 Triggers types instead of v1alpha1 ones. The v1beta1 type has also been enabled as the storage type. This should be a backwards compatible change. Users should still be able to use the v1alpha1 types as they have before. Part of #1067 Signed-off-by: Dibyo Mukherjee <dibyo@google.com>
tektoncd · Jun 15, 2021 · df265d0 · df265d0
1 parent b7678ad
commit df265d0
Show file tree

Hide file tree

Showing 38 changed files with 541 additions and 570 deletions.
diff --git a/cmd/binding-eval/cmd/root.go b/cmd/binding-eval/cmd/root.go
@@ -28,7 +28,7 @@ import (
 	"sort"
 
 	"github.com/spf13/cobra"
-	"github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1"
+	"github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1"
 	"github.com/tektoncd/triggers/pkg/template"
 	"k8s.io/apimachinery/pkg/runtime/serializer/streaming"
 	"k8s.io/client-go/kubernetes/scheme"
@@ -72,7 +72,7 @@ func evalBinding(w io.Writer, bindingPath, httpPath string) error {
 		return fmt.Errorf("error reading bindings: %w", err)
 	}
 
-	bindingParams := []v1alpha1.Param{}
+	bindingParams := []v1beta1.Param{}
 	for _, b := range bindings {
 		bindingParams = append(bindingParams, b.Spec.Params...)
 	}
@@ -99,16 +99,16 @@ func evalBinding(w io.Writer, bindingPath, httpPath string) error {
 	return nil
 }
 
-func readBindings(path string) ([]*v1alpha1.TriggerBinding, error) {
+func readBindings(path string) ([]*v1beta1.TriggerBinding, error) {
 	f, err := os.Open(path)
 	if err != nil {
 		return nil, fmt.Errorf("error reading binding file: %w", err)
 	}
 	defer f.Close()
 
-	var list []*v1alpha1.TriggerBinding
+	var list []*v1beta1.TriggerBinding
 	decoder := streaming.NewDecoder(f, scheme.Codecs.UniversalDecoder())
-	b := new(v1alpha1.TriggerBinding)
+	b := new(v1beta1.TriggerBinding)
 	for err == nil {
 		_, _, err = decoder.Decode(nil, b)
 		if err != nil {

diff --git a/cmd/eventlistenersink/main.go b/cmd/eventlistenersink/main.go
@@ -152,11 +152,11 @@ func main() {
 		Recorder:               recorder,
 		Auth:                   sink.DefaultAuthOverride{},
 		// Register all the listers we'll need
-		EventListenerLister:         factory.Triggers().V1alpha1().EventListeners().Lister(),
-		TriggerLister:               factory.Triggers().V1alpha1().Triggers().Lister(),
-		TriggerBindingLister:        factory.Triggers().V1alpha1().TriggerBindings().Lister(),
-		ClusterTriggerBindingLister: factory.Triggers().V1alpha1().ClusterTriggerBindings().Lister(),
-		TriggerTemplateLister:       factory.Triggers().V1alpha1().TriggerTemplates().Lister(),
+		EventListenerLister:         factory.Triggers().V1beta1().EventListeners().Lister(),
+		TriggerLister:               factory.Triggers().V1beta1().Triggers().Lister(),
+		TriggerBindingLister:        factory.Triggers().V1beta1().TriggerBindings().Lister(),
+		ClusterTriggerBindingLister: factory.Triggers().V1beta1().ClusterTriggerBindings().Lister(),
+		TriggerTemplateLister:       factory.Triggers().V1beta1().TriggerTemplates().Lister(),
 		ClusterInterceptorLister:    factory.Triggers().V1alpha1().ClusterInterceptors().Lister(),
 	}
 

diff --git a/cmd/triggerrun/cmd/root.go b/cmd/triggerrun/cmd/root.go
@@ -31,8 +31,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/tektoncd/triggers/pkg/apis/triggers"
-	"github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1"
-	triggersv1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1"
+	triggersv1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1"
 	triggersclientset "github.com/tektoncd/triggers/pkg/client/clientset/versioned"
 	dynamicClientset "github.com/tektoncd/triggers/pkg/client/dynamic/clientset"
 	"github.com/tektoncd/triggers/pkg/client/dynamic/clientset/tekton"
@@ -139,16 +138,16 @@ func trigger(triggerFile, httpPath, action, kubeconfig string, writer io.Writer)
 	return nil
 }
 
-func readTrigger(path string) ([]*v1alpha1.Trigger, error) {
+func readTrigger(path string) ([]*triggersv1.Trigger, error) {
 	f, err := os.Open(path)
 	if err != nil {
 		return nil, fmt.Errorf("error reading trigger file: %w", err)
 	}
 	defer f.Close()
 
-	var list []*v1alpha1.Trigger
+	var list []*triggersv1.Trigger
 	decoder := streaming.NewDecoder(f, scheme.Codecs.UniversalDecoder())
-	b := new(v1alpha1.Trigger)
+	b := new(triggersv1.Trigger)
 	for err == nil {
 		_, _, err = decoder.Decode(nil, b)
 		if err != nil {
@@ -213,13 +212,13 @@ func processTriggerSpec(kubeClient kubernetes.Interface, client triggersclientse
 
 	rt, err := template.ResolveTrigger(*tri,
 		func(name string) (*triggersv1.TriggerBinding, error) {
-			return client.TriggersV1alpha1().TriggerBindings(tri.Namespace).Get(context.Background(), name, metav1.GetOptions{})
+			return client.TriggersV1beta1().TriggerBindings(tri.Namespace).Get(context.Background(), name, metav1.GetOptions{})
 		},
 		func(name string) (*triggersv1.ClusterTriggerBinding, error) {
-			return client.TriggersV1alpha1().ClusterTriggerBindings().Get(context.Background(), name, metav1.GetOptions{})
+			return client.TriggersV1beta1().ClusterTriggerBindings().Get(context.Background(), name, metav1.GetOptions{})
 		},
 		func(name string) (*triggersv1.TriggerTemplate, error) {
-			return client.TriggersV1alpha1().TriggerTemplates(tri.Namespace).Get(context.Background(), name, metav1.GetOptions{})
+			return client.TriggersV1beta1().TriggerTemplates(tri.Namespace).Get(context.Background(), name, metav1.GetOptions{})
 		})
 	if err != nil {
 		log.Error("Failed to resolve Trigger: ", err)

diff --git a/cmd/triggerrun/cmd/root_test.go b/cmd/triggerrun/cmd/root_test.go
@@ -25,16 +25,14 @@ import (
 	"strings"
 	"testing"
 
-	"go.uber.org/zap/zaptest"
-
 	"github.com/google/go-cmp/cmp"
 	pipelinev1alpha1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1"
 	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
-	"github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1"
-	triggersv1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1"
+	triggersv1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1"
 	triggersclientset "github.com/tektoncd/triggers/pkg/client/clientset/versioned"
 	"github.com/tektoncd/triggers/pkg/sink"
 	"github.com/tektoncd/triggers/test"
+	"go.uber.org/zap/zaptest"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes"
@@ -60,19 +58,19 @@ func TestReadTrigger(t *testing.T) {
 		t.Fatalf("failed to read trigger:%+v", err)
 	}
 
-	want := []*v1alpha1.Trigger{{
+	want := []*triggersv1.Trigger{{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "triggers.tekton.dev/v1alpha1",
 			Kind:       "Trigger",
 		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "trigger-run",
 		},
-		Spec: v1alpha1.TriggerSpec{
-			Bindings: []*v1alpha1.TriggerSpecBinding{
+		Spec: triggersv1.TriggerSpec{
+			Bindings: []*triggersv1.TriggerSpecBinding{
 				{Ref: "git-event-binding"},
 			},
-			Template: v1alpha1.TriggerSpecTemplate{
+			Template: triggersv1.TriggerSpecTemplate{
 				Ref: ptr.String("simple-pipeline-template"),
 			},
 		},
@@ -167,7 +165,7 @@ func Test_processTriggerSpec(t *testing.T) {
 		},
 	}
 
-	triggerBinding := v1alpha1.TriggerBinding{
+	triggerBinding := triggersv1.TriggerBinding{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "git-event-binding",
 			Namespace: "default",
@@ -209,20 +207,20 @@ func Test_processTriggerSpec(t *testing.T) {
 	}{{
 		name: "testing-name",
 		args: args{
-			t: &v1alpha1.Trigger{
+			t: &triggersv1.Trigger{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "my-triggerRun",
 				},
-				Spec: v1alpha1.TriggerSpec{
-					Bindings: []*v1alpha1.TriggerSpecBinding{{Ref: "git-event-binding"}},                // These should be references to TriggerBindings defined below
-					Template: v1alpha1.TriggerSpecTemplate{Ref: ptr.String("simple-pipeline-template")}, // This should be a reference to a TriggerTemplate defined below
+				Spec: triggersv1.TriggerSpec{
+					Bindings: []*triggersv1.TriggerSpecBinding{{Ref: "git-event-binding"}},                // These should be references to TriggerBindings defined below
+					Template: triggersv1.TriggerSpecTemplate{Ref: ptr.String("simple-pipeline-template")}, // This should be a reference to a TriggerTemplate defined below
 				},
 			},
 			request: r,
 			event:   eventBody,
 			resources: test.Resources{
 				// Add any resources that we need to create with a fake client
-				TriggerBindings:  []*v1alpha1.TriggerBinding{&triggerBinding},
+				TriggerBindings:  []*triggersv1.TriggerBinding{&triggerBinding},
 				TriggerTemplates: []*triggersv1.TriggerTemplate{&triggerTemplate},
 			},
 		},

diff --git a/config/300-clustertriggerbinding.yaml b/config/300-clustertriggerbinding.yaml
@@ -35,8 +35,8 @@ spec:
     - tekton-triggers
   versions:
   - name: v1beta1
-    served: false
-    storage: false
+    served: true
+    storage: true
     schema:
       openAPIV3Schema:
         type: object
@@ -52,7 +52,7 @@ spec:
       status: {}
   - name: v1alpha1
     served: true
-    storage: true
+    storage: false
     schema:
       openAPIV3Schema:
         type: object

diff --git a/config/300-eventlistener.yaml b/config/300-eventlistener.yaml
@@ -35,8 +35,8 @@ spec:
     - tekton-triggers
   versions:
   - name: v1beta1
-    served: false
-    storage: false
+    served: true
+    storage: true
     # Opt into the status subresource so metadata.generation
     # starts to increment
     subresources:
@@ -71,7 +71,7 @@ spec:
 
   - name: v1alpha1
     served: true
-    storage: true
+    storage: false
     schema:
       openAPIV3Schema:
         type: object

diff --git a/config/300-trigger.yaml b/config/300-trigger.yaml
@@ -35,8 +35,8 @@ spec:
     - tekton-triggers
   versions:
   - name: v1beta1
-    served: false
-    storage: false
+    served: true
+    storage: true
     schema:
       openAPIV3Schema:
         type: object
@@ -52,7 +52,7 @@ spec:
       status: {}
   - name: v1alpha1
     served: true
-    storage: true
+    storage: false
     schema:
       openAPIV3Schema:
         type: object

diff --git a/config/300-triggerbinding.yaml b/config/300-triggerbinding.yaml
@@ -35,8 +35,8 @@ spec:
     - tekton-triggers
   versions:
   - name: v1beta1
-    served: false
-    storage: false
+    served: true
+    storage: true
     schema:
       openAPIV3Schema:
         type: object
@@ -55,7 +55,7 @@ spec:
 
   - name: v1alpha1
     served: true
-    storage: true
+    storage: false
     schema:
       openAPIV3Schema:
         type: object

diff --git a/config/300-triggertemplate.yaml b/config/300-triggertemplate.yaml
@@ -35,8 +35,8 @@ spec:
     - tekton-triggers
   versions:
   - name: v1beta1
-    served: false
-    storage: false
+    served: true
+    storage: true
     schema:
       openAPIV3Schema:
         type: object
@@ -54,7 +54,7 @@ spec:
       status: {}
   - name: v1alpha1
     served: true
-    storage: true
+    storage: false
     schema:
       openAPIV3Schema:
         type: object

diff --git a/pkg/apis/triggers/v1beta1/event_listener_types.go b/pkg/apis/triggers/v1beta1/event_listener_types.go
@@ -26,7 +26,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"knative.dev/pkg/apis"
 	duckv1 "knative.dev/pkg/apis/duck/v1"
-	duckv1alpha1 "knative.dev/pkg/apis/duck/v1alpha1"
 	"knative.dev/pkg/apis/duck/v1beta1"
 )
 
@@ -144,7 +143,7 @@ type EventListenerStatus struct {
 
 	// EventListener is Addressable. It currently exposes the service DNS
 	// address of the the EventListener sink
-	duckv1alpha1.AddressStatus `json:",inline"`
+	v1beta1.AddressStatus `json:",inline"`
 
 	// Configuration stores configuration for the EventListener service
 	Configuration EventListenerConfig `json:"configuration"`
@@ -315,7 +314,7 @@ func (el *EventListener) GetOwnerReference() *metav1.OwnerReference {
 // SetAddress sets the address (as part of Addressable contract) and marks the correct condition.
 func (els *EventListenerStatus) SetAddress(hostname string) {
 	if els.Address == nil {
-		els.Address = &duckv1alpha1.Addressable{}
+		els.Address = &v1beta1.Addressable{}
 	}
 	if hostname != "" {
 		els.Address.URL = &apis.URL{

diff --git a/pkg/interceptors/bitbucket/bitbucket.go b/pkg/interceptors/bitbucket/bitbucket.go
@@ -25,7 +25,7 @@ import (
 	corev1lister "k8s.io/client-go/listers/core/v1"
 
 	gh "github.com/google/go-github/v31/github"
-	triggersv1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1"
+	triggersv1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1"
 	"github.com/tektoncd/triggers/pkg/interceptors"
 	"go.uber.org/zap"
 )

diff --git a/pkg/interceptors/bitbucket/bitbucket_test.go b/pkg/interceptors/bitbucket/bitbucket_test.go
@@ -21,11 +21,9 @@ import (
 	"net/http"
 	"testing"
 
-	"go.uber.org/zap/zaptest"
-
+	triggersv1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1"
 	"github.com/tektoncd/triggers/test"
-
-	triggersv1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1"
+	"go.uber.org/zap/zaptest"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	fakeSecretInformer "knative.dev/pkg/client/injection/kube/informers/core/v1/secret/fake"

diff --git a/pkg/interceptors/cel/cel.go b/pkg/interceptors/cel/cel.go
@@ -39,7 +39,7 @@ import (
 	"google.golang.org/protobuf/proto"
 	corev1lister "k8s.io/client-go/listers/core/v1"
 
-	triggersv1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1"
+	triggersv1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1"
 )
 
 var _ triggersv1.InterceptorInterface = (*Interceptor)(nil)

diff --git a/pkg/interceptors/cel/cel_test.go b/pkg/interceptors/cel/cel_test.go
@@ -34,12 +34,11 @@ import (
 	"github.com/google/cel-go/common/types"
 	"github.com/google/cel-go/common/types/ref"
 	"github.com/google/go-cmp/cmp"
+	triggersv1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	fakeSecretInformer "knative.dev/pkg/client/injection/kube/informers/core/v1/secret/fake"
 	rtesting "knative.dev/pkg/reconciler/testing"
-
-	triggersv1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1"
 )
 
 const testNS = "testing-ns"

diff --git a/pkg/interceptors/cel/triggers.go b/pkg/interceptors/cel/triggers.go
@@ -32,7 +32,7 @@ import (
 	"github.com/tektoncd/triggers/pkg/interceptors"
 	"sigs.k8s.io/yaml"
 
-	triggersv1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1"
+	triggersv1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1"
 	exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
 	corev1lister "k8s.io/client-go/listers/core/v1"
 )

diff --git a/pkg/interceptors/github/github.go b/pkg/interceptors/github/github.go
@@ -23,7 +23,7 @@ import (
 	"google.golang.org/grpc/codes"
 
 	gh "github.com/google/go-github/v31/github"
-	triggersv1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1"
+	triggersv1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1"
 	"github.com/tektoncd/triggers/pkg/interceptors"
 	"go.uber.org/zap"
 	corev1lister "k8s.io/client-go/listers/core/v1"

diff --git a/pkg/interceptors/github/github_test.go b/pkg/interceptors/github/github_test.go
@@ -21,7 +21,7 @@ import (
 	"net/http"
 	"testing"
 
-	triggersv1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1"
+	triggersv1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1"
 	"github.com/tektoncd/triggers/test"
 	"go.uber.org/zap/zaptest"
 	corev1 "k8s.io/api/core/v1"

diff --git a/pkg/interceptors/gitlab/gitlab.go b/pkg/interceptors/gitlab/gitlab.go
@@ -21,13 +21,11 @@ import (
 	"crypto/subtle"
 	"fmt"
 
+	triggersv1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1"
 	"github.com/tektoncd/triggers/pkg/interceptors"
+	"go.uber.org/zap"
 	"google.golang.org/grpc/codes"
 	corev1lister "k8s.io/client-go/listers/core/v1"
-
-	triggersv1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1"
-
-	"go.uber.org/zap"
 )
 
 var _ triggersv1.InterceptorInterface = (*Interceptor)(nil)