From fa66fa1914f05f102d2694c48ce1413b84c74976 Mon Sep 17 00:00:00 2001 From: Cali0707 Date: Thu, 24 Oct 2024 15:52:41 -0400 Subject: [PATCH] fix(build): components use correct v1beta3 interfaces when making the et autocreate handler Signed-off-by: Cali0707 --- cmd/broker/filter/main.go | 4 ++-- cmd/broker/ingress/main.go | 6 +++--- pkg/reconciler/inmemorychannel/dispatcher/controller.go | 4 ++-- .../inmemorychannel/dispatcher/controller_test.go | 2 +- .../inmemorychannel/dispatcher/inmemorychannel.go | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cmd/broker/filter/main.go b/cmd/broker/filter/main.go index e491670f934..bf6d19cdf89 100644 --- a/cmd/broker/filter/main.go +++ b/cmd/broker/filter/main.go @@ -47,7 +47,7 @@ import ( eventingclient "knative.dev/eventing/pkg/client/injection/client" brokerinformer "knative.dev/eventing/pkg/client/injection/informers/eventing/v1/broker" triggerinformer "knative.dev/eventing/pkg/client/injection/informers/eventing/v1/trigger" - eventtypeinformer "knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta2/eventtype" + eventtypeinformer "knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta3/eventtype" subscriptioninformer "knative.dev/eventing/pkg/client/injection/informers/messaging/v1/subscription" "knative.dev/eventing/pkg/eventingtls" "knative.dev/eventing/pkg/eventtype" @@ -130,7 +130,7 @@ func main() { if featureFlags.IsEnabled(feature.EvenTypeAutoCreate) && featureStore != nil && handler != nil { autoCreate := &eventtype.EventTypeAutoHandler{ EventTypeLister: eventtypeinformer.Get(ctx).Lister(), - EventingClient: eventingclient.Get(ctx).EventingV1beta2(), + EventingClient: eventingclient.Get(ctx).EventingV1beta3(), FeatureStore: featureStore, Logger: logger, } diff --git a/cmd/broker/ingress/main.go b/cmd/broker/ingress/main.go index bd8e76d8fea..ade719ec1af 100644 --- a/cmd/broker/ingress/main.go +++ b/cmd/broker/ingress/main.go @@ -50,7 +50,7 @@ import ( eventingclient "knative.dev/eventing/pkg/client/injection/client" brokerinformer "knative.dev/eventing/pkg/client/injection/informers/eventing/v1/broker" eventpolicyinformer "knative.dev/eventing/pkg/client/injection/informers/eventing/v1alpha1/eventpolicy" - eventtypeinformer "knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta2/eventtype" + eventtypeinformer "knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta3/eventtype" "knative.dev/eventing/pkg/eventingtls" "knative.dev/eventing/pkg/eventtype" "knative.dev/eventing/pkg/reconciler/names" @@ -153,7 +153,7 @@ func main() { if featureFlags.IsEnabled(feature.EvenTypeAutoCreate) && featureStore != nil && handler != nil { autoCreate := &eventtype.EventTypeAutoHandler{ EventTypeLister: eventtypeinformer.Get(ctx).Lister(), - EventingClient: eventingclient.Get(ctx).EventingV1beta2(), + EventingClient: eventingclient.Get(ctx).EventingV1beta3(), FeatureStore: featureStore, Logger: logger, } @@ -190,7 +190,7 @@ func main() { if featureStore.IsEnabled(feature.EvenTypeAutoCreate) { autoCreate := &eventtype.EventTypeAutoHandler{ EventTypeLister: eventtypeinformer.Get(ctx).Lister(), - EventingClient: eventingclient.Get(ctx).EventingV1beta2(), + EventingClient: eventingclient.Get(ctx).EventingV1beta3(), FeatureStore: featureStore, Logger: logger, } diff --git a/pkg/reconciler/inmemorychannel/dispatcher/controller.go b/pkg/reconciler/inmemorychannel/dispatcher/controller.go index 2eac2c0771c..77fd0342f62 100644 --- a/pkg/reconciler/inmemorychannel/dispatcher/controller.go +++ b/pkg/reconciler/inmemorychannel/dispatcher/controller.go @@ -55,7 +55,7 @@ import ( "knative.dev/eventing/pkg/channel" eventingclient "knative.dev/eventing/pkg/client/injection/client" eventpolicyinformer "knative.dev/eventing/pkg/client/injection/informers/eventing/v1alpha1/eventpolicy" - eventtypeinformer "knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta2/eventtype" + eventtypeinformer "knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta3/eventtype" inmemorychannelinformer "knative.dev/eventing/pkg/client/injection/informers/messaging/v1/inmemorychannel" inmemorychannelreconciler "knative.dev/eventing/pkg/client/injection/reconciler/messaging/v1/inmemorychannel" "knative.dev/eventing/pkg/inmemorychannel" @@ -143,7 +143,7 @@ func NewController( multiChannelEventHandler: sh, reporter: reporter, messagingClientSet: eventingclient.Get(ctx).MessagingV1(), - eventingClient: eventingclient.Get(ctx).EventingV1beta2(), + eventingClient: eventingclient.Get(ctx).EventingV1beta3(), eventTypeLister: eventtypeinformer.Get(ctx).Lister(), eventDispatcher: kncloudevents.NewDispatcher(clientConfig, oidcTokenProvider), authVerifier: auth.NewVerifier(ctx, eventpolicyinformer.Get(ctx).Lister(), trustBundleConfigMapLister, cmw), diff --git a/pkg/reconciler/inmemorychannel/dispatcher/controller_test.go b/pkg/reconciler/inmemorychannel/dispatcher/controller_test.go index ed9994d934c..73d013c26ec 100644 --- a/pkg/reconciler/inmemorychannel/dispatcher/controller_test.go +++ b/pkg/reconciler/inmemorychannel/dispatcher/controller_test.go @@ -41,7 +41,7 @@ import ( _ "knative.dev/pkg/injection/clients/namespacedkube/informers/core/v1/secret/fake" _ "knative.dev/eventing/pkg/client/injection/informers/eventing/v1alpha1/eventpolicy/fake" - _ "knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta2/eventtype/fake" + _ "knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta3/eventtype/fake" _ "knative.dev/eventing/pkg/client/injection/informers/messaging/v1/inmemorychannel/fake" ) diff --git a/pkg/reconciler/inmemorychannel/dispatcher/inmemorychannel.go b/pkg/reconciler/inmemorychannel/dispatcher/inmemorychannel.go index 5949f5b1382..8f663491d65 100644 --- a/pkg/reconciler/inmemorychannel/dispatcher/inmemorychannel.go +++ b/pkg/reconciler/inmemorychannel/dispatcher/inmemorychannel.go @@ -42,10 +42,10 @@ import ( "knative.dev/eventing/pkg/channel" "knative.dev/eventing/pkg/channel/fanout" "knative.dev/eventing/pkg/channel/multichannelfanout" - eventingv1beta2 "knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta2" + eventingv1beta3 "knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta3" messagingv1 "knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1" reconcilerv1 "knative.dev/eventing/pkg/client/injection/reconciler/messaging/v1/inmemorychannel" - "knative.dev/eventing/pkg/client/listers/eventing/v1beta2" + "knative.dev/eventing/pkg/client/listers/eventing/v1beta3" "knative.dev/eventing/pkg/eventingtls" "knative.dev/eventing/pkg/eventtype" "knative.dev/eventing/pkg/kncloudevents" @@ -56,9 +56,9 @@ type Reconciler struct { multiChannelEventHandler multichannelfanout.MultiChannelEventHandler reporter channel.StatsReporter messagingClientSet messagingv1.MessagingV1Interface - eventTypeLister v1beta2.EventTypeLister + eventTypeLister v1beta3.EventTypeLister inMemoryChannelLister listers.InMemoryChannelLister - eventingClient eventingv1beta2.EventingV1beta2Interface + eventingClient eventingv1beta3.EventingV1beta3Interface featureStore *feature.Store eventDispatcher *kncloudevents.Dispatcher