Skip to content

Commit 32fcea4

Browse files
committed
remove options
1 parent 2e8e0c9 commit 32fcea4

File tree

1 file changed

+15
-17
lines changed

1 file changed

+15
-17
lines changed

cmd/controller-manager/app/controllermanager.go

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -353,23 +353,21 @@ func startClusterStatusController(ctx controllerscontext.Context) (enabled bool,
353353
},
354354
}
355355
clusterStatusController := &status.ClusterStatusController{
356-
Client: mgr.GetClient(),
357-
KubeClient: kubeclientset.NewForConfigOrDie(mgr.GetConfig()),
358-
EventRecorder: mgr.GetEventRecorderFor(status.ControllerName), //nolint:staticcheck // Note: GetEventRecorderFor is deprecated in controller-runtime v0.23.0 in favor of GetEventRecorder. This changes event API from v1 events to events.k8s.io. We need to migrate carefully, especially considering the impact on users and RBAC permission changes in installation/deployment tools.
359-
PredicateFunc: clusterPredicateFunc,
360-
TypedInformerManager: typedmanager.GetInstance(),
361-
GenericInformerManager: genericmanager.GetInstance(),
362-
ClusterClientSetFunc: util.NewClusterClientSet,
363-
ClusterDynamicClientSetFunc: util.NewClusterDynamicClientSet,
364-
ClusterClientOption: ctx.ClusterClientOption,
365-
ClusterStatusUpdateFrequency: opts.ClusterStatusUpdateFrequency,
366-
ClusterLeaseDuration: opts.ClusterLeaseDuration,
367-
ClusterLeaseRenewIntervalFraction: opts.ClusterLeaseRenewIntervalFraction,
368-
ClusterSuccessThreshold: opts.ClusterSuccessThreshold,
369-
ClusterFailureThreshold: opts.ClusterFailureThreshold,
370-
ClusterCacheSyncTimeout: opts.ClusterCacheSyncTimeout,
371-
RateLimiterOptions: ctx.Opts.RateLimiterOptions,
372-
EnableClusterResourceModeling: ctx.Opts.EnableClusterResourceModeling,
356+
Client: mgr.GetClient(),
357+
KubeClient: kubeclientset.NewForConfigOrDie(mgr.GetConfig()),
358+
EventRecorder: mgr.GetEventRecorderFor(status.ControllerName), //nolint:staticcheck // Note: GetEventRecorderFor is deprecated in controller-runtime v0.23.0 in favor of GetEventRecorder. This changes event API from v1 events to events.k8s.io. We need to migrate carefully, especially considering the impact on users and RBAC permission changes in installation/deployment tools.
359+
PredicateFunc: clusterPredicateFunc,
360+
TypedInformerManager: typedmanager.GetInstance(),
361+
GenericInformerManager: genericmanager.GetInstance(),
362+
ClusterClientSetFunc: util.NewClusterClientSet,
363+
ClusterDynamicClientSetFunc: util.NewClusterDynamicClientSet,
364+
ClusterClientOption: ctx.ClusterClientOption,
365+
ClusterStatusUpdateFrequency: opts.ClusterStatusUpdateFrequency,
366+
ClusterSuccessThreshold: opts.ClusterSuccessThreshold,
367+
ClusterFailureThreshold: opts.ClusterFailureThreshold,
368+
ClusterCacheSyncTimeout: opts.ClusterCacheSyncTimeout,
369+
RateLimiterOptions: ctx.Opts.RateLimiterOptions,
370+
EnableClusterResourceModeling: ctx.Opts.EnableClusterResourceModeling,
373371
}
374372
if err := clusterStatusController.SetupWithManager(mgr); err != nil {
375373
return false, err

0 commit comments

Comments
 (0)