[release-v1.11] Cherry pick eventtype autocreate fixes

cmd/broker/ingress/main.go

@@ -131,12 +131,26 @@ func main() {
 		logger.Fatal("Error setting up trace publishing", zap.Error(err))
 	}
 
-	featureStore := feature.NewStore(logging.FromContext(ctx).Named("feature-config-store"))
+	var featureStore *feature.Store
+	var handler *ingress.Handler
+
+	featureStore = feature.NewStore(logging.FromContext(ctx).Named("feature-config-store"), func(name string, value interface{}) {
+		featureFlags := value.(feature.Flags)
+		if featureFlags.IsEnabled(feature.EvenTypeAutoCreate) && featureStore != nil && handler != nil {
+			autoCreate := &eventtype.EventTypeAutoHandler{
+				EventTypeLister: eventtypeinformer.Get(ctx).Lister(),
+				EventingClient:  eventingclient.Get(ctx).EventingV1beta2(),
+				FeatureStore:    featureStore,
+				Logger:          logger,
+			}
+			handler.EvenTypeHandler = autoCreate
+		}
+	})
 	featureStore.WatchConfigs(configMapWatcher)
 
 	reporter := ingress.NewStatsReporter(env.ContainerName, kmeta.ChildName(env.PodName, uuid.New().String()))
 
-	handler, err := ingress.NewHandler(logger, reporter, broker.TTLDefaulter(logger, int32(env.MaxTTL)), brokerInformer)
+	handler, err = ingress.NewHandler(logger, reporter, broker.TTLDefaulter(logger, int32(env.MaxTTL)), brokerInformer)
 	if err != nil {
 		logger.Fatal("Error creating Handler", zap.Error(err))
 	}

pkg/broker/ingress/ingress_handler.go

@@ -249,13 +249,20 @@ func (h *Handler) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
 }
 
 func toKReference(broker *eventingv1.Broker) *duckv1.KReference {
-	return &duckv1.KReference{
+	kref := &duckv1.KReference{
 		Kind:       broker.Kind,
 		Namespace:  broker.Namespace,
 		Name:       broker.Name,
 		APIVersion: broker.APIVersion,
 		Address:    broker.Status.Address.Name,
 	}
+	if kref.Kind == "" {
+		kref.Kind = "Broker"
+	}
+	if kref.APIVersion == "" {
+		kref.APIVersion = "eventing.knative.dev/v1"
+	}
+	return kref
 }
 
 func (h *Handler) receive(ctx context.Context, headers http.Header, event *cloudevents.Event, brokerNamespace, brokerName string) (int, time.Duration) {

pkg/reconciler/inmemorychannel/dispatcher/inmemorychannel.go

@@ -93,17 +93,22 @@ func (r *Reconciler) reconcile(ctx context.Context, imc *v1.InMemoryChannel) rec
 		return err
 	}
 	var eventTypeAutoHandler *eventtype.EventTypeAutoHandler
-	var channelReference *duckv1.KReference
+	var channelRef *duckv1.KReference
 	var UID *types.UID
-	if r.featureStore.IsEnabled(feature.EvenTypeAutoCreate) {
+	if ownerReferences := imc.GetOwnerReferences(); r.featureStore.IsEnabled(feature.EvenTypeAutoCreate) &&
+		(len(ownerReferences) == 0 ||
+			ownerReferences[0].Kind != "Broker") {
+		logging.FromContext(ctx).Info("EventType autocreate is enabled, creating handler")
 		eventTypeAutoHandler = &eventtype.EventTypeAutoHandler{
 			EventTypeLister: r.eventTypeLister,
 			EventingClient:  r.eventingClient,
 			FeatureStore:    r.featureStore,
 			Logger:          logging.FromContext(ctx).Desugar(),
 		}
-		channelReference = toKReference(imc)
+
+		channelRef = toKReference(imc)
 		UID = &imc.UID
+
 	}
 
 	// First grab the host based MultiChannelFanoutMessage httpHandler
@@ -116,7 +121,7 @@ func (r *Reconciler) reconcile(ctx context.Context, imc *v1.InMemoryChannel) rec
 			config.FanoutConfig,
 			r.reporter,
 			eventTypeAutoHandler,
-			channelReference,
+			channelRef,
 			UID,
 		)
 		if err != nil {
@@ -145,7 +150,7 @@ func (r *Reconciler) reconcile(ctx context.Context, imc *v1.InMemoryChannel) rec
 			config.FanoutConfig,
 			r.reporter,
 			eventTypeAutoHandler,
-			channelReference,
+			channelRef,
 			UID,
 			channel.ResolveMessageChannelFromPath(channel.ParseChannelFromPath),
 		)