From c04375a84e57cd6b6ac2c961b3950844cb34cba7 Mon Sep 17 00:00:00 2001 From: Yijie Wang Date: Mon, 22 Jan 2024 11:56:05 -0500 Subject: [PATCH] updated service account informers in other places --- pkg/reconciler/broker/trigger/controller.go | 6 +++--- pkg/reconciler/containersource/controller.go | 4 ++-- pkg/reconciler/parallel/controller.go | 6 +++--- pkg/reconciler/pingsource/controller.go | 6 +++--- pkg/reconciler/sequence/controller.go | 6 +++--- pkg/reconciler/sinkbinding/controller.go | 6 +++--- pkg/reconciler/subscription/controller.go | 6 +++--- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkg/reconciler/broker/trigger/controller.go b/pkg/reconciler/broker/trigger/controller.go index fba74b28b37..953dfc0b616 100644 --- a/pkg/reconciler/broker/trigger/controller.go +++ b/pkg/reconciler/broker/trigger/controller.go @@ -62,7 +62,7 @@ func NewController( subscriptionInformer := subscriptioninformer.Get(ctx) configmapInformer := configmapinformer.Get(ctx) secretInformer := secretinformer.Get(ctx) - serviceaccountInformer := serviceaccountinformer.Get(ctx, sources.OIDCTokenRoleLabelSelector) + oidcServiceaccountInformer := serviceaccountinformer.Get(ctx, sources.OIDCTokenRoleLabelSelector) featureStore := feature.NewStore(logging.FromContext(ctx).Named("feature-config-store")) featureStore.WatchConfigs(cmw) @@ -77,7 +77,7 @@ func NewController( triggerLister: triggerLister, configmapLister: configmapInformer.Lister(), secretLister: secretInformer.Lister(), - serviceAccountLister: serviceaccountInformer.Lister(), + serviceAccountLister: oidcServiceaccountInformer.Lister(), } impl := triggerreconciler.NewImpl(ctx, r, func(impl *controller.Impl) controller.Options { return controller.Options{ @@ -115,7 +115,7 @@ func NewController( }) // Reconciler Trigger when the OIDC service account changes - serviceaccountInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{ + oidcServiceaccountInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{ FilterFunc: controller.FilterController(&eventing.Trigger{}), Handler: controller.HandleAll(impl.EnqueueControllerOf), }) diff --git a/pkg/reconciler/containersource/controller.go b/pkg/reconciler/containersource/controller.go index 9710f14b85b..de31e7d5140 100644 --- a/pkg/reconciler/containersource/controller.go +++ b/pkg/reconciler/containersource/controller.go @@ -52,7 +52,7 @@ func NewController( containersourceInformer := containersourceinformer.Get(ctx) sinkbindingInformer := sinkbindinginformer.Get(ctx) deploymentInformer := deploymentinformer.Get(ctx) - serviceaccountInformer := serviceaccountinformer.Get(ctx, sources.OIDCTokenRoleLabelSelector) + oidcServiceaccountInformer := serviceaccountinformer.Get(ctx, sources.OIDCTokenRoleLabelSelector) trustBundleConfigMapInformer := configmapinformer.Get(ctx, eventingtls.TrustBundleLabelSelector) var globalResync func(obj interface{}) @@ -70,7 +70,7 @@ func NewController( containerSourceLister: containersourceInformer.Lister(), deploymentLister: deploymentInformer.Lister(), sinkBindingLister: sinkbindingInformer.Lister(), - serviceAccountLister: serviceaccountInformer.Lister(), + serviceAccountLister: oidcServiceaccountInformer.Lister(), trustBundleConfigMapLister: trustBundleConfigMapInformer.Lister(), } impl := v1containersource.NewImpl(ctx, r, func(impl *controller.Impl) controller.Options { diff --git a/pkg/reconciler/parallel/controller.go b/pkg/reconciler/parallel/controller.go index 1b4a2853619..4e13326532e 100644 --- a/pkg/reconciler/parallel/controller.go +++ b/pkg/reconciler/parallel/controller.go @@ -48,7 +48,7 @@ func NewController( parallelInformer := parallel.Get(ctx) subscriptionInformer := subscription.Get(ctx) - serviceaccountInformer := serviceaccountinformer.Get(ctx, sources.OIDCTokenRoleLabelSelector) + oidcServiceaccountInformer := serviceaccountinformer.Get(ctx, sources.OIDCTokenRoleLabelSelector) var globalResync func(obj interface{}) featureStore := feature.NewStore(logging.FromContext(ctx).Named("feature-config-store"), func(name string, value interface{}) { @@ -61,7 +61,7 @@ func NewController( r := &Reconciler{ parallelLister: parallelInformer.Lister(), subscriptionLister: subscriptionInformer.Lister(), - serviceAccountLister: serviceaccountInformer.Lister(), + serviceAccountLister: oidcServiceaccountInformer.Lister(), kubeclient: kubeclient.Get(ctx), dynamicClientSet: dynamicclient.Get(ctx), eventingClientSet: eventingclient.Get(ctx), @@ -86,7 +86,7 @@ func NewController( Handler: controller.HandleAll(impl.EnqueueControllerOf), }) // Reconcile Parallel when the OIDC service account changes - serviceaccountInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{ + oidcServiceaccountInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{ FilterFunc: controller.FilterController(&v1.Parallel{}), Handler: controller.HandleAll(impl.EnqueueControllerOf), }) diff --git a/pkg/reconciler/pingsource/controller.go b/pkg/reconciler/pingsource/controller.go index a00bd2eecb9..26f07baa387 100644 --- a/pkg/reconciler/pingsource/controller.go +++ b/pkg/reconciler/pingsource/controller.go @@ -78,13 +78,13 @@ func NewController( deploymentInformer := deploymentinformer.Get(ctx) pingSourceInformer := pingsourceinformer.Get(ctx) - serviceaccountInformer := serviceaccountinformer.Get(ctx, sources.OIDCTokenRoleLabelSelector) + oidcServiceaccountInformer := serviceaccountinformer.Get(ctx, sources.OIDCTokenRoleLabelSelector) r := &Reconciler{ kubeClientSet: kubeclient.Get(ctx), leConfig: leConfig, configAcc: reconcilersource.WatchConfigurations(ctx, component, cmw), - serviceAccountLister: serviceaccountInformer.Lister(), + serviceAccountLister: oidcServiceaccountInformer.Lister(), } impl := pingsourcereconciler.NewImpl(ctx, r, func(impl *controller.Impl) controller.Options { @@ -114,7 +114,7 @@ func NewController( )), }) - serviceaccountInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{ + oidcServiceaccountInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{ FilterFunc: controller.FilterController(&sourcesv1.PingSource{}), Handler: controller.HandleAll(impl.EnqueueControllerOf), }) diff --git a/pkg/reconciler/sequence/controller.go b/pkg/reconciler/sequence/controller.go index d8cb8e83d89..acbeefe7e9a 100644 --- a/pkg/reconciler/sequence/controller.go +++ b/pkg/reconciler/sequence/controller.go @@ -48,7 +48,7 @@ func NewController( sequenceInformer := sequence.Get(ctx) subscriptionInformer := subscription.Get(ctx) - serviceaccountInformer := serviceaccountinformer.Get(ctx, sources.OIDCTokenRoleLabelSelector) + oidcServiceaccountInformer := serviceaccountinformer.Get(ctx, sources.OIDCTokenRoleLabelSelector) var globalResync func(obj interface{}) featureStore := feature.NewStore(logging.FromContext(ctx).Named("feature-config-store"), func(name string, value interface{}) { @@ -63,7 +63,7 @@ func NewController( subscriptionLister: subscriptionInformer.Lister(), dynamicClientSet: dynamicclient.Get(ctx), eventingClientSet: eventingclient.Get(ctx), - serviceAccountLister: serviceaccountInformer.Lister(), + serviceAccountLister: oidcServiceaccountInformer.Lister(), kubeclient: kubeclient.Get(ctx), } @@ -88,7 +88,7 @@ func NewController( }) // Reconcile Sequence when the OIDC service account changes - serviceaccountInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{ + oidcServiceaccountInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{ FilterFunc: controller.FilterController(&v1.Sequence{}), Handler: controller.HandleAll(impl.EnqueueControllerOf), }) diff --git a/pkg/reconciler/sinkbinding/controller.go b/pkg/reconciler/sinkbinding/controller.go index 9028e3c7b91..3f733a4329a 100644 --- a/pkg/reconciler/sinkbinding/controller.go +++ b/pkg/reconciler/sinkbinding/controller.go @@ -82,7 +82,7 @@ func NewController( dc := dynamicclient.Get(ctx) psInformerFactory := podspecable.Get(ctx) namespaceInformer := namespace.Get(ctx) - serviceaccountInformer := serviceaccountinformer.Get(ctx, sources.OIDCTokenRoleLabelSelector) + oidcServiceaccountInformer := Serviceaccountinformer.Get(ctx, sources.OIDCTokenRoleLabelSelector) secretInformer := secretinformer.Get(ctx) trustBundleConfigMapInformer := configmapinformer.Get(ctx, eventingtls.TrustBundleLabelSelector) trustBundleConfigMapLister := configmapinformer.Get(ctx, eventingtls.TrustBundleLabelSelector).Lister() @@ -138,7 +138,7 @@ func NewController( res: sbResolver, tracker: impl.Tracker, kubeclient: kubeclient.Get(ctx), - serviceAccountLister: serviceaccountInformer.Lister(), + serviceAccountLister: oidcServiceaccountInformer.Lister(), secretLister: secretInformer.Lister(), featureStore: featureStore, tokenProvider: auth.NewOIDCTokenProvider(ctx), @@ -157,7 +157,7 @@ func NewController( } // Reconcile SinkBinding when the OIDC service account changes - serviceaccountInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{ + oidcServiceaccountInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{ FilterFunc: controller.FilterController(&v1.SinkBinding{}), Handler: controller.HandleAll(impl.EnqueueControllerOf), }) diff --git a/pkg/reconciler/subscription/controller.go b/pkg/reconciler/subscription/controller.go index 44fd2a495f3..97f2005f329 100644 --- a/pkg/reconciler/subscription/controller.go +++ b/pkg/reconciler/subscription/controller.go @@ -50,7 +50,7 @@ func NewController( subscriptionInformer := subscription.Get(ctx) channelInformer := channel.Get(ctx) - serviceaccountInformer := serviceaccountinformer.Get(ctx, sources.OIDCTokenRoleLabelSelector) + oidcServiceaccountInformer := serviceaccountinformer.Get(ctx, sources.OIDCTokenRoleLabelSelector) var globalResync func(obj interface{}) @@ -67,7 +67,7 @@ func NewController( kreferenceResolver: kref.NewKReferenceResolver(customresourcedefinition.Get(ctx).Lister()), subscriptionLister: subscriptionInformer.Lister(), channelLister: channelInformer.Lister(), - serviceAccountLister: serviceaccountInformer.Lister(), + serviceAccountLister: oidcServiceaccountInformer.Lister(), } impl := subscriptionreconciler.NewImpl(ctx, r, func(impl *controller.Impl) controller.Options { return controller.Options{ @@ -99,7 +99,7 @@ func NewController( )) // Reconciler Subscription when the OIDC service account changes - serviceaccountInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{ + oidcServiceaccountInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{ FilterFunc: controller.FilterController(&messagingv1.Subscription{}), Handler: controller.HandleAll(impl.EnqueueControllerOf), })