From 9c4f232671c5553316030ec25ca9610ba81ead0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20St=C3=A4bler?= Date: Thu, 2 May 2024 17:55:59 +0200 Subject: [PATCH] Remove unneeded comments --- control-plane/pkg/reconciler/trigger/controller.go | 2 -- control-plane/pkg/reconciler/trigger/controller_test.go | 1 - .../pkg/reconciler/trigger/namespaced_controller.go | 7 ++----- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/control-plane/pkg/reconciler/trigger/controller.go b/control-plane/pkg/reconciler/trigger/controller.go index 16d0298adc..41138ca061 100644 --- a/control-plane/pkg/reconciler/trigger/controller.go +++ b/control-plane/pkg/reconciler/trigger/controller.go @@ -49,7 +49,6 @@ import ( triggerreconciler "knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1/trigger" eventinglisters "knative.dev/eventing/pkg/client/listers/eventing/v1" - // serviceaccountinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/serviceaccount" serviceaccountinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/serviceaccount/filtered" "knative.dev/eventing-kafka-broker/control-plane/pkg/config" @@ -71,7 +70,6 @@ func NewController(ctx context.Context, watcher configmap.Watcher, configs *conf brokerInformer := brokerinformer.Get(ctx) triggerInformer := triggerinformer.Get(ctx) triggerLister := triggerInformer.Lister() - // serviceaccountInformer := serviceaccountinformer.Get(ctx) oidcServiceaccountInformer := serviceaccountinformer.Get(ctx, auth.OIDCLabelSelector) clientPool := clientpool.Get(ctx) diff --git a/control-plane/pkg/reconciler/trigger/controller_test.go b/control-plane/pkg/reconciler/trigger/controller_test.go index 031afd3e9a..80ed0165ff 100644 --- a/control-plane/pkg/reconciler/trigger/controller_test.go +++ b/control-plane/pkg/reconciler/trigger/controller_test.go @@ -50,7 +50,6 @@ import ( ) func TestNewController(t *testing.T) { - // ctx, _ := reconcilertesting.SetupFakeContext(t) ctx, _ := reconcilertesting.SetupFakeContext(t, SetUpInformerSelector) ctx = clientpool.WithKafkaClientPool(ctx) diff --git a/control-plane/pkg/reconciler/trigger/namespaced_controller.go b/control-plane/pkg/reconciler/trigger/namespaced_controller.go index 6afbc15c73..75d0eba629 100644 --- a/control-plane/pkg/reconciler/trigger/namespaced_controller.go +++ b/control-plane/pkg/reconciler/trigger/namespaced_controller.go @@ -63,7 +63,6 @@ func NewNamespacedController(ctx context.Context, watcher configmap.Watcher, con brokerInformer := brokerinformer.Get(ctx) triggerInformer := triggerinformer.Get(ctx) triggerLister := triggerInformer.Lister() - // serviceaccountInformer := serviceaccountinformer.Get(ctx) oidcServiceaccountInformer := serviceaccountinformer.Get(ctx, auth.OIDCLabelSelector) clientPool := clientpool.Get(ctx) @@ -84,9 +83,8 @@ func NewNamespacedController(ctx context.Context, watcher configmap.Watcher, con FlagsHolder: &FlagsHolder{ Flags: feature.Flags{}, }, - BrokerLister: brokerInformer.Lister(), - ConfigMapLister: configmapInformer.Lister(), - // ServiceAccountLister: serviceaccountInformer.Lister(), + BrokerLister: brokerInformer.Lister(), + ConfigMapLister: configmapInformer.Lister(), ServiceAccountLister: oidcServiceaccountInformer.Lister(), EventingClient: eventingclient.Get(ctx), Env: configs, @@ -155,7 +153,6 @@ func NewNamespacedController(ctx context.Context, watcher configmap.Watcher, con secretinformer.Get(ctx).Informer().AddEventHandler(controller.HandleAll(reconciler.Tracker.OnChanged)) // Reconciler Trigger when the OIDC service account changes - // serviceaccountInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{ oidcServiceaccountInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{ FilterFunc: filterOIDCServiceAccounts(triggerInformer.Lister(), brokerInformer.Lister(), kafka.BrokerClass, FinalizerName), Handler: controller.HandleAll(impl.EnqueueControllerOf),