Switch EventType reconciler to v1beta1 version (#3200)

* generate v1beta reconciler

* try to create propagate  broker status method

* Create a conversion for brokerstatus

* Fix test types

* add PropagateV1Alpha1BrokerStatus unit test

* update code-gen

* remove old generated reconciler

pkg/apis/eventing/v1alpha1/broker_conversion.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"fmt"
 
+	corev1 "k8s.io/api/core/v1"
 	"knative.dev/eventing/pkg/apis/eventing/v1beta1"
 	"knative.dev/pkg/apis"
 )
@@ -60,3 +61,22 @@ func (sink *Broker) ConvertFrom(ctx context.Context, obj apis.Convertible) error
 		return fmt.Errorf("Unknown conversion, got: %T", source)
 	}
 }
+
+// PropagateV1Alpha1BrokerStatus propagates a v1alpha1 BrokerStatus to a v1beta1 EventTypeStatus
+func PropagateV1Alpha1BrokerStatus(et *v1beta1.EventTypeStatus, bs *BrokerStatus) {
+	bc := brokerCondSet.Manage(bs).GetTopLevelCondition()
+	if bc == nil {
+		et.MarkBrokerNotConfigured()
+		return
+	}
+	switch {
+	case bc.Status == corev1.ConditionUnknown:
+		et.MarkBrokerUnknown(bc.Reason, bc.Message)
+	case bc.Status == corev1.ConditionTrue:
+		eventTypeCondSet.Manage(et).MarkTrue(EventTypeConditionBrokerReady)
+	case bc.Status == corev1.ConditionFalse:
+		et.MarkBrokerFailed(bc.Reason, bc.Message)
+	default:
+		et.MarkBrokerUnknown("BrokerUnknown", "The status of Broker is invalid: %v", bc.Status)
+	}
+}

pkg/apis/eventing/v1alpha1/broker_conversion_test.go

@@ -148,6 +148,60 @@ func TestBrokerConversion(t *testing.T) {
 	}
 }
 
+func TestBrokerPropagateStatus(t *testing.T) {
+	tests := []struct {
+		name                string
+		markBrokerExists    *bool
+		brokerStatus        *BrokerStatus
+		wantConditionStatus corev1.ConditionStatus
+	}{{
+		name:                "all happy",
+		markBrokerExists:    &trueValue,
+		brokerStatus:        TestHelper.ReadyBrokerStatus(),
+		wantConditionStatus: corev1.ConditionTrue,
+	}, {
+		name:                "broker exist sad",
+		markBrokerExists:    &falseValue,
+		brokerStatus:        nil,
+		wantConditionStatus: corev1.ConditionFalse,
+	}, {
+		name:                "broker ready sad",
+		markBrokerExists:    &trueValue,
+		brokerStatus:        TestHelper.FalseBrokerStatus(),
+		wantConditionStatus: corev1.ConditionFalse,
+	}, {
+		name:                "broker ready unknown",
+		markBrokerExists:    &trueValue,
+		brokerStatus:        TestHelper.UnknownBrokerStatus(),
+		wantConditionStatus: corev1.ConditionUnknown,
+	}, {
+		name:                "all sad",
+		markBrokerExists:    &falseValue,
+		brokerStatus:        nil,
+		wantConditionStatus: corev1.ConditionFalse,
+	}}
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			ets := &v1beta1.EventTypeStatus{}
+			if test.markBrokerExists != nil {
+				if *test.markBrokerExists {
+					ets.MarkBrokerExists()
+				} else {
+					ets.MarkBrokerDoesNotExist()
+				}
+			}
+			if test.brokerStatus != nil {
+				PropagateV1Alpha1BrokerStatus(ets, test.brokerStatus)
+			}
+
+			got := ets.GetTopLevelCondition().Status
+			if test.wantConditionStatus != got {
+				t.Errorf("unexpected readiness: want %v, got %v", test.wantConditionStatus, got)
+			}
+		})
+	}
+}
+
 // Since v1beta1 to v1alpha1 is lossy but semantically equivalent,
 // fix that so diff works.
 func fixBrokerDeprecated(in *Broker) *Broker {

pkg/apis/eventing/v1alpha1/eventtype_types.go

@@ -26,7 +26,6 @@ import (
 )
 
 // +genclient
-// +genreconciler
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 type EventType struct {

pkg/apis/eventing/v1beta1/eventtype_lifecycle.go

@@ -18,6 +18,7 @@ package v1beta1
 
 import (
 	corev1 "k8s.io/api/core/v1"
+
 	"knative.dev/pkg/apis"
 )
 

pkg/apis/eventing/v1beta1/eventtype_types.go

@@ -26,6 +26,7 @@ import (
 )
 
 // +genclient
+// +genreconciler
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 type EventType struct {

pkg/apis/eventing/v1beta1/register.go

@@ -47,8 +47,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&Broker{},
 		&BrokerList{},
-		//		&EventType{},
-		//		&EventTypeList{},
+		&EventType{},
+		&EventTypeList{},
 		&Trigger{},
 		&TriggerList{},
 	)

pkg/reconciler/eventtype/controller.go

@@ -21,14 +21,14 @@ import (
 
 	"knative.dev/pkg/logging"
 
-	"knative.dev/eventing/pkg/apis/eventing/v1alpha1"
 	"knative.dev/pkg/configmap"
 	"knative.dev/pkg/controller"
 	"knative.dev/pkg/tracker"
 
+	"knative.dev/eventing/pkg/apis/eventing/v1alpha1"
 	brokerinformer "knative.dev/eventing/pkg/client/injection/informers/eventing/v1alpha1/broker"
-	eventtypeinformer "knative.dev/eventing/pkg/client/injection/informers/eventing/v1alpha1/eventtype"
-	eventtypereconciler "knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1alpha1/eventtype"
+	eventtypeinformer "knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/eventtype"
+	eventtypereconciler "knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1beta1/eventtype"
 )
 
 // NewController initializes the controller and is called by the generated code

pkg/reconciler/eventtype/controller_test.go

@@ -25,7 +25,7 @@ import (
 
 	// Fake injection informers
 	_ "knative.dev/eventing/pkg/client/injection/informers/eventing/v1alpha1/broker/fake"
-	_ "knative.dev/eventing/pkg/client/injection/informers/eventing/v1alpha1/eventtype/fake"
+	_ "knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/eventtype/fake"
 )
 
 func TestNew(t *testing.T) {

pkg/reconciler/eventtype/eventtype.go

@@ -23,8 +23,10 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	apierrs "k8s.io/apimachinery/pkg/api/errors"
 	"knative.dev/eventing/pkg/apis/eventing/v1alpha1"
-	eventtypereconciler "knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1alpha1/eventtype"
-	listers "knative.dev/eventing/pkg/client/listers/eventing/v1alpha1"
+	"knative.dev/eventing/pkg/apis/eventing/v1beta1"
+	eventtypereconciler "knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1beta1/eventtype"
+	alphalisters "knative.dev/eventing/pkg/client/listers/eventing/v1alpha1"
+	betalisters "knative.dev/eventing/pkg/client/listers/eventing/v1beta1"
 	"knative.dev/eventing/pkg/logging"
 	pkgreconciler "knative.dev/pkg/reconciler"
 	"knative.dev/pkg/tracker"
@@ -38,8 +40,8 @@ func newReconciledNormal(namespace, name string) pkgreconciler.Event {
 
 type Reconciler struct {
 	// listers index properties about resources
-	eventTypeLister listers.EventTypeLister
-	brokerLister    listers.BrokerLister
+	eventTypeLister betalisters.EventTypeLister
+	brokerLister    alphalisters.BrokerLister
 	tracker         tracker.Interface
 }
 
@@ -52,7 +54,7 @@ var _ eventtypereconciler.Interface = (*Reconciler)(nil)
 // 1. Verify the Broker exists.
 // 2. Verify the Broker is ready.
 // TODO remove https://github.com/knative/eventing/issues/2750
-func (r *Reconciler) ReconcileKind(ctx context.Context, et *v1alpha1.EventType) pkgreconciler.Event {
+func (r *Reconciler) ReconcileKind(ctx context.Context, et *v1beta1.EventType) pkgreconciler.Event {
 	et.Status.InitializeConditions()
 	et.Status.ObservedGeneration = et.Generation
 
@@ -82,12 +84,12 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, et *v1alpha1.EventType)
 		return err
 	}
 
-	et.Status.PropagateBrokerStatus(&b.Status)
+	v1alpha1.PropagateV1Alpha1BrokerStatus(&et.Status, &b.Status)
 
 	return newReconciledNormal(et.Namespace, et.Name)
 }
 
 // getBroker returns the Broker for EventType 'et' if it exists, otherwise it returns an error.
-func (r *Reconciler) getBroker(ctx context.Context, et *v1alpha1.EventType) (*v1alpha1.Broker, error) {
+func (r *Reconciler) getBroker(ctx context.Context, et *v1beta1.EventType) (*v1alpha1.Broker, error) {
 	return r.brokerLister.Brokers(et.Namespace).Get(et.Spec.Broker)
 }