diff --git a/cmd/agent/app/agent.go b/cmd/agent/app/agent.go index 93cdbfbcf..b73ad3f1b 100644 --- a/cmd/agent/app/agent.go +++ b/cmd/agent/app/agent.go @@ -262,14 +262,13 @@ func startClusterStatusController(ctx controllerscontext.Context) (bool, error) func startExecutionController(ctx controllerscontext.Context) (bool, error) { executionController := &execution.Controller{ - Client: ctx.Mgr.GetClient(), - EventRecorder: ctx.Mgr.GetEventRecorderFor(execution.ControllerName), - RESTMapper: ctx.Mgr.GetRESTMapper(), - ObjectWatcher: ctx.ObjectWatcher, - PredicateFunc: helper.NewExecutionPredicateOnAgent(), - InformerManager: informermanager.GetInstance(), - ClusterClientSetFunc: util.NewClusterDynamicClientSetForAgent, - RatelimiterOptions: ctx.Opts.RateLimiterOptions, + Client: ctx.Mgr.GetClient(), + EventRecorder: ctx.Mgr.GetEventRecorderFor(execution.ControllerName), + RESTMapper: ctx.Mgr.GetRESTMapper(), + ObjectWatcher: ctx.ObjectWatcher, + PredicateFunc: helper.NewExecutionPredicateOnAgent(), + InformerManager: informermanager.GetInstance(), + RatelimiterOptions: ctx.Opts.RateLimiterOptions, } if err := executionController.SetupWithManager(ctx.Mgr); err != nil { return false, err diff --git a/cmd/controller-manager/app/controllermanager.go b/cmd/controller-manager/app/controllermanager.go index 351e38c6a..b38a7c607 100644 --- a/cmd/controller-manager/app/controllermanager.go +++ b/cmd/controller-manager/app/controllermanager.go @@ -320,14 +320,13 @@ func startBindingController(ctx controllerscontext.Context) (enabled bool, err e func startExecutionController(ctx controllerscontext.Context) (enabled bool, err error) { executionController := &execution.Controller{ - Client: ctx.Mgr.GetClient(), - EventRecorder: ctx.Mgr.GetEventRecorderFor(execution.ControllerName), - RESTMapper: ctx.Mgr.GetRESTMapper(), - ObjectWatcher: ctx.ObjectWatcher, - PredicateFunc: helper.NewExecutionPredicate(ctx.Mgr), - InformerManager: informermanager.GetInstance(), - ClusterClientSetFunc: util.NewClusterDynamicClientSet, - RatelimiterOptions: ctx.Opts.RateLimiterOptions, + Client: ctx.Mgr.GetClient(), + EventRecorder: ctx.Mgr.GetEventRecorderFor(execution.ControllerName), + RESTMapper: ctx.Mgr.GetRESTMapper(), + ObjectWatcher: ctx.ObjectWatcher, + PredicateFunc: helper.NewExecutionPredicate(ctx.Mgr), + InformerManager: informermanager.GetInstance(), + RatelimiterOptions: ctx.Opts.RateLimiterOptions, } if err := executionController.SetupWithManager(ctx.Mgr); err != nil { return false, err diff --git a/pkg/controllers/execution/execution_controller.go b/pkg/controllers/execution/execution_controller.go index b67a53d65..b3c05f3c6 100644 --- a/pkg/controllers/execution/execution_controller.go +++ b/pkg/controllers/execution/execution_controller.go @@ -37,14 +37,13 @@ const ( // Controller is to sync Work. type Controller struct { - client.Client // used to operate Work resources. - EventRecorder record.EventRecorder - RESTMapper meta.RESTMapper - ObjectWatcher objectwatcher.ObjectWatcher - PredicateFunc predicate.Predicate - InformerManager informermanager.MultiClusterInformerManager - ClusterClientSetFunc func(clusterName string, client client.Client) (*util.DynamicClusterClient, error) - RatelimiterOptions ratelimiterflag.Options + client.Client // used to operate Work resources. + EventRecorder record.EventRecorder + RESTMapper meta.RESTMapper + ObjectWatcher objectwatcher.ObjectWatcher + PredicateFunc predicate.Predicate + InformerManager informermanager.MultiClusterInformerManager + RatelimiterOptions ratelimiterflag.Options } // Reconcile performs a full reconciliation for the object referred to by the Request.