Skip to content

chore: remove duplicate reconcile logging #2496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 9, 2025
Merged

chore: remove duplicate reconcile logging #2496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions pkg/controllers/disruption/queue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,6 @@ func NewQueue(kubeClient client.Client, recorder events.Recorder, cluster *state
}

func (q *Queue) Register(ctx context.Context, m manager.Manager) error {
maxConcurrentReconciles := utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), 100, 1000)
log.FromContext(ctx).V(1).Info("disruption.queue maxConcurrentReconciles set", "maxConcurrentReconciles", maxConcurrentReconciles)
return controllerruntime.NewControllerManagedBy(m).
Named("disruption.queue").
WatchesRawSource(source.Channel(q.source, &handler.TypedEnqueueRequestForObject[*v1.NodeClaim]{})).
Expand All @@ -131,7 +129,7 @@ func (q *Queue) Register(ctx context.Context, m manager.Manager) error {
workqueue.NewTypedItemExponentialFailureRateLimiter[reconcile.Request](queueBaseDelay, queueMaxDelay),
&workqueue.TypedBucketRateLimiter[reconcile.Request]{Limiter: rate.NewLimiter(rate.Limit(100), 1000)},
),
MaxConcurrentReconciles: maxConcurrentReconciles,
MaxConcurrentReconciles: utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), 100, 1000),
}).
Complete(reconcile.AsReconciler(m.GetClient(), q))
}
Expand Down
4 changes: 1 addition & 3 deletions pkg/controllers/node/health/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,12 @@ func NewController(kubeClient client.Client, cloudProvider cloudprovider.CloudPr
}

func (c *Controller) Register(ctx context.Context, m manager.Manager) error {
maxConcurrentReconciles := utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), 10, 1000)
log.FromContext(ctx).V(1).Info("node.health maxConcurrentReconciles set", "maxConcurrentReconciles", maxConcurrentReconciles)
return controllerruntime.NewControllerManagedBy(m).
Named("node.health").
For(&corev1.Node{}, builder.WithPredicates(nodeutils.IsManagedPredicateFuncs(c.cloudProvider))).
WithOptions(controller.Options{
RateLimiter: reasonable.RateLimiter(),
MaxConcurrentReconciles: maxConcurrentReconciles,
MaxConcurrentReconciles: utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), 10, 1000),
}).
Complete(reconcile.AsReconciler(m.GetClient(), c))
}
Expand Down
4 changes: 1 addition & 3 deletions pkg/controllers/node/hydration/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,13 @@ func (c *Controller) Name() string {
}

func (c *Controller) Register(ctx context.Context, m manager.Manager) error {
maxConcurrentReconciles := utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), 1000, 5000)
log.FromContext(ctx).V(1).Info("node.hydration maxConcurrentReconciles set", "maxConcurrentReconciles", maxConcurrentReconciles)
return controllerruntime.NewControllerManagedBy(m).
Named(c.Name()).
For(&corev1.Node{}).
Watches(&v1.NodeClaim{}, nodeutils.NodeClaimEventHandler(c.kubeClient)).
WithOptions(controller.Options{
RateLimiter: reasonable.RateLimiter(),
MaxConcurrentReconciles: maxConcurrentReconciles,
MaxConcurrentReconciles: utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), 1000, 5000),
}).
Complete(reconcile.AsReconciler(m.GetClient(), c))
}
1 change: 0 additions & 1 deletion pkg/controllers/node/termination/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,6 @@ func (c *Controller) nodeTerminationTime(node *corev1.Node, nodeClaim *v1.NodeCl

func (c *Controller) Register(ctx context.Context, m manager.Manager) error {
maxConcurrentReconciles := utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), minReconciles, maxReconciles)
log.FromContext(ctx).V(1).Info("node.termination maxConcurrentReconciles set", "maxConcurrentReconciles", maxConcurrentReconciles)
qps, bucketSize := utilscontroller.GetTypedBucketConfigs(10, minReconciles, maxConcurrentReconciles)
return controllerruntime.NewControllerManagedBy(m).
Named("node.termination").
Expand Down
1 change: 0 additions & 1 deletion pkg/controllers/node/termination/terminator/eviction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ func (q *Queue) Name() string {

func (q *Queue) Register(ctx context.Context, m manager.Manager) error {
maxConcurrentReconciles := utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), minReconciles, maxReconciles)
log.FromContext(ctx).V(1).Info("eviction-queue maxConcurrentReconciles set", "maxConcurrentReconciles", maxConcurrentReconciles)
qps, bucketSize := utilscontroller.GetTypedBucketConfigs(100, minReconciles, maxConcurrentReconciles)
return controllerruntime.NewControllerManagedBy(m).
Named(q.Name()).
Expand Down
4 changes: 1 addition & 3 deletions pkg/controllers/nodeclaim/consistency/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,15 +150,13 @@ func (c *Controller) checkConsistency(ctx context.Context, nodeClaim *v1.NodeCla
}

func (c *Controller) Register(ctx context.Context, m manager.Manager) error {
maxConcurrentReconciles := utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), 10, 1000)
log.FromContext(ctx).V(1).Info("nodeclaim.consistency maxConcurrentReconciles set", "maxConcurrentReconciles", maxConcurrentReconciles)
return controllerruntime.NewControllerManagedBy(m).
Named("nodeclaim.consistency").
For(&v1.NodeClaim{}, builder.WithPredicates(nodeclaimutils.IsManagedPredicateFuncs(c.cloudProvider))).
Watches(
&corev1.Node{},
nodeclaimutils.NodeEventHandler(c.kubeClient, c.cloudProvider),
).
WithOptions(controller.Options{MaxConcurrentReconciles: maxConcurrentReconciles}).
WithOptions(controller.Options{MaxConcurrentReconciles: utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), 10, 1000)}).
Complete(reconcile.AsReconciler(m.GetClient(), c))
}
4 changes: 1 addition & 3 deletions pkg/controllers/nodeclaim/disruption/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,10 @@ func (c *Controller) Reconcile(ctx context.Context, nodeClaim *v1.NodeClaim) (re
}

func (c *Controller) Register(ctx context.Context, m manager.Manager) error {
maxConcurrentReconciles := utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), 10, 1000)
log.FromContext(ctx).V(1).Info("nodeclaim.disruption maxConcurrentReconciles set", "maxConcurrentReconciles", maxConcurrentReconciles)
b := controllerruntime.NewControllerManagedBy(m).
Named("nodeclaim.disruption").
For(&v1.NodeClaim{}, builder.WithPredicates(nodeclaimutils.IsManagedPredicateFuncs(c.cloudProvider))).
WithOptions(controller.Options{MaxConcurrentReconciles: maxConcurrentReconciles}).
WithOptions(controller.Options{MaxConcurrentReconciles: utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), 10, 1000)}).
Watches(&v1.NodePool{}, nodeclaimutils.NodePoolEventHandler(c.kubeClient, c.cloudProvider)).
Watches(&corev1.Pod{}, nodeclaimutils.PodEventHandler(c.kubeClient, c.cloudProvider))

Expand Down
4 changes: 1 addition & 3 deletions pkg/controllers/nodeclaim/hydration/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,12 @@ func (c *Controller) Name() string {
}

func (c *Controller) Register(ctx context.Context, m manager.Manager) error {
maxConcurrentReconciles := utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), 1000, 5000)
log.FromContext(ctx).V(1).Info("nodeclaim.hydration maxConcurrentReconciles set", "maxConcurrentReconciles", maxConcurrentReconciles)
return controllerruntime.NewControllerManagedBy(m).
Named(c.Name()).
For(&v1.NodeClaim{}, builder.WithPredicates(nodeclaimutils.IsManagedPredicateFuncs(c.cloudProvider))).
WithOptions(controller.Options{
RateLimiter: reasonable.RateLimiter(),
MaxConcurrentReconciles: maxConcurrentReconciles,
MaxConcurrentReconciles: utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), 1000, 5000),
}).
Complete(reconcile.AsReconciler(m.GetClient(), c))
}
1 change: 0 additions & 1 deletion pkg/controllers/nodeclaim/lifecycle/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ func NewController(clk clock.Clock, kubeClient client.Client, cloudProvider clou
func (c *Controller) Register(ctx context.Context, m manager.Manager) error {
// higher concurrency limit since we want fast reaction to node syncing and launch
maxConcurrentReconciles := utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), minReconciles, maxReconciles)
log.FromContext(ctx).V(1).Info("nodeclaim.lifecycle maxConcurrentReconciles set", "maxConcurrentReconciles", maxConcurrentReconciles)
qps, bucketSize := utilscontroller.GetTypedBucketConfigs(10, minReconciles, maxConcurrentReconciles)
return controllerruntime.NewControllerManagedBy(m).
Named(c.Name()).
Expand Down
6 changes: 1 addition & 5 deletions pkg/controllers/nodepool/counter/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/event"
"sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
Expand Down Expand Up @@ -92,16 +91,13 @@ func (c *Controller) Reconcile(ctx context.Context, nodePool *v1.NodePool) (reco
}

func (c *Controller) Register(ctx context.Context, m manager.Manager) error {
maxConcurrentReconciles := utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), 10, 1000)
log.FromContext(ctx).V(1).Info("nodepool.counter maxConcurrentReconciles set", "maxConcurrentReconciles", maxConcurrentReconciles)
return controllerruntime.NewControllerManagedBy(m).
Named("nodepool.counter").
For(&v1.NodePool{}, builder.WithPredicates(nodepoolutils.IsManagedPredicateFuncs(c.cloudProvider), predicate.Funcs{
CreateFunc: func(e event.CreateEvent) bool { return true },
UpdateFunc: func(e event.UpdateEvent) bool { return false },
DeleteFunc: func(e event.DeleteEvent) bool { return false },
})).
WithOptions(controller.Options{MaxConcurrentReconciles: maxConcurrentReconciles}).
WithOptions(controller.Options{MaxConcurrentReconciles: utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), 10, 1000)}).
Complete(reconcile.AsReconciler(m.GetClient(), c))

}
5 changes: 1 addition & 4 deletions pkg/controllers/nodepool/hash/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/builder"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

Expand Down Expand Up @@ -80,12 +79,10 @@ func (c *Controller) Reconcile(ctx context.Context, np *v1.NodePool) (reconcile.
}

func (c *Controller) Register(ctx context.Context, m manager.Manager) error {
maxConcurrentReconciles := utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), 10, 1000)
log.FromContext(ctx).V(1).Info("nodepool.hash maxConcurrentReconciles set", "maxConcurrentReconciles", maxConcurrentReconciles)
return controllerruntime.NewControllerManagedBy(m).
Named("nodepool.hash").
For(&v1.NodePool{}, builder.WithPredicates(nodepoolutils.IsManagedPredicateFuncs(c.cloudProvider))).
WithOptions(controller.Options{MaxConcurrentReconciles: maxConcurrentReconciles}).
WithOptions(controller.Options{MaxConcurrentReconciles: utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), 10, 1000)}).
Complete(reconcile.AsReconciler(m.GetClient(), c))
}

Expand Down
5 changes: 1 addition & 4 deletions pkg/controllers/nodepool/readiness/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/builder"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

Expand Down Expand Up @@ -98,12 +97,10 @@ func (c *Controller) setReadyCondition(nodePool *v1.NodePool, nodeClass status.O
}

func (c *Controller) Register(ctx context.Context, m manager.Manager) error {
maxConcurrentReconciles := utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), 10, 1000)
log.FromContext(ctx).V(1).Info("nodepool.readiness maxConcurrentReconciles set", "maxConcurrentReconciles", maxConcurrentReconciles)
b := controllerruntime.NewControllerManagedBy(m).
Named("nodepool.readiness").
For(&v1.NodePool{}, builder.WithPredicates(nodepoolutils.IsManagedPredicateFuncs(c.cloudProvider))).
WithOptions(controller.Options{MaxConcurrentReconciles: maxConcurrentReconciles})
WithOptions(controller.Options{MaxConcurrentReconciles: utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), 10, 1000)})
for _, nodeClass := range c.cloudProvider.GetSupportedNodeClasses() {
b.Watches(nodeClass, nodepoolutils.NodeClassEventHandler(c.kubeClient))
}
Expand Down
5 changes: 1 addition & 4 deletions pkg/controllers/nodepool/registrationhealth/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/builder"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

Expand Down Expand Up @@ -87,12 +86,10 @@ func (c *Controller) Reconcile(ctx context.Context, nodePool *v1.NodePool) (reco
}

func (c *Controller) Register(ctx context.Context, m manager.Manager) error {
maxConcurrentReconciles := utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), 10, 1000)
log.FromContext(ctx).V(1).Info("nodepool.registrationhealth maxConcurrentReconciles set", "maxConcurrentReconciles", maxConcurrentReconciles)
b := controllerruntime.NewControllerManagedBy(m).
Named("nodepool.registrationhealth").
For(&v1.NodePool{}, builder.WithPredicates(nodepoolutils.IsManagedPredicateFuncs(c.cloudProvider))).
WithOptions(controller.Options{MaxConcurrentReconciles: maxConcurrentReconciles})
WithOptions(controller.Options{MaxConcurrentReconciles: utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), 10, 1000)})
for _, nodeClass := range c.cloudProvider.GetSupportedNodeClasses() {
b.Watches(nodeClass, nodepoolutils.NodeClassEventHandler(c.kubeClient))
}
Expand Down
9 changes: 2 additions & 7 deletions pkg/controllers/provisioning/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (
controllerruntime "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

Expand Down Expand Up @@ -75,12 +74,10 @@ func (c *PodController) Reconcile(ctx context.Context, p *corev1.Pod) (reconcile
}

func (c *PodController) Register(ctx context.Context, m manager.Manager) error {
maxConcurrentReconciles := utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), minReconciles, maxReconciles)
log.FromContext(ctx).V(1).Info("provisioner.trigger.pod maxConcurrentReconciles set", "maxConcurrentReconciles", maxConcurrentReconciles)
return controllerruntime.NewControllerManagedBy(m).
Named("provisioner.trigger.pod").
For(&corev1.Pod{}).
WithOptions(controller.Options{MaxConcurrentReconciles: maxConcurrentReconciles}).
WithOptions(controller.Options{MaxConcurrentReconciles: utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), minReconciles, maxReconciles)}).
Complete(reconcile.AsReconciler(m.GetClient(), c))
}

Expand Down Expand Up @@ -120,11 +117,9 @@ func (c *NodeController) Reconcile(ctx context.Context, n *corev1.Node) (reconci
}

func (c *NodeController) Register(ctx context.Context, m manager.Manager) error {
maxConcurrentReconciles := utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), minReconciles, maxReconciles)
log.FromContext(ctx).V(1).Info("provisioner.trigger.node maxConcurrentReconciles set", "maxConcurrentReconciles", maxConcurrentReconciles)
return controllerruntime.NewControllerManagedBy(m).
Named("provisioner.trigger.node").
For(&corev1.Node{}).
WithOptions(controller.Options{MaxConcurrentReconciles: maxConcurrentReconciles}).
WithOptions(controller.Options{MaxConcurrentReconciles: utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), minReconciles, maxReconciles)}).
Complete(reconcile.AsReconciler(m.GetClient(), c))
}
5 changes: 1 addition & 4 deletions pkg/controllers/state/informer/daemonset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/event"
"sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
Expand Down Expand Up @@ -66,8 +65,6 @@ func (c *DaemonSetController) Reconcile(ctx context.Context, req reconcile.Reque
}

func (c *DaemonSetController) Register(ctx context.Context, m manager.Manager) error {
maxConcurrentReconciles := utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), minReconciles, maxReconciles)
log.FromContext(ctx).V(1).Info("state.daemonset maxConcurrentReconciles set", "maxConcurrentReconciles", maxConcurrentReconciles)
return controllerruntime.NewControllerManagedBy(m).
Named("state.daemonset").
For(&appsv1.DaemonSet{}).
Expand All @@ -86,6 +83,6 @@ func (c *DaemonSetController) Register(ctx context.Context, m manager.Manager) e
return false
},
}).
WithOptions(controller.Options{MaxConcurrentReconciles: maxConcurrentReconciles}).
WithOptions(controller.Options{MaxConcurrentReconciles: utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), minReconciles, maxReconciles)}).
Complete(c)
}
5 changes: 1 addition & 4 deletions pkg/controllers/state/informer/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (
controllerruntime "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

Expand Down Expand Up @@ -66,11 +65,9 @@ func (c *NodeController) Reconcile(ctx context.Context, req reconcile.Request) (
}

func (c *NodeController) Register(ctx context.Context, m manager.Manager) error {
maxConcurrentReconciles := utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), minReconciles, maxReconciles)
log.FromContext(ctx).V(1).Info("state.node maxConcurrentReconciles set", "maxConcurrentReconciles", maxConcurrentReconciles)
return controllerruntime.NewControllerManagedBy(m).
Named("state.node").
For(&v1.Node{}).
WithOptions(controller.Options{MaxConcurrentReconciles: maxConcurrentReconciles}).
WithOptions(controller.Options{MaxConcurrentReconciles: utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), minReconciles, maxReconciles)}).
Complete(c)
}
5 changes: 1 addition & 4 deletions pkg/controllers/state/informer/nodeclaim.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/builder"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

Expand Down Expand Up @@ -72,11 +71,9 @@ func (c *NodeClaimController) Reconcile(ctx context.Context, req reconcile.Reque
}

func (c *NodeClaimController) Register(ctx context.Context, m manager.Manager) error {
maxConcurrentReconciles := utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), minReconciles, maxReconciles)
log.FromContext(ctx).V(1).Info("state.nodeclaim maxConcurrentReconciles set", "maxConcurrentReconciles", maxConcurrentReconciles)
return controllerruntime.NewControllerManagedBy(m).
Named("state.nodeclaim").
For(&v1.NodeClaim{}, builder.WithPredicates(nodeclaimutils.IsManagedPredicateFuncs(c.cloudProvider))).
WithOptions(controller.Options{MaxConcurrentReconciles: maxConcurrentReconciles}).
WithOptions(controller.Options{MaxConcurrentReconciles: utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), minReconciles, maxReconciles)}).
Complete(c)
}
5 changes: 1 addition & 4 deletions pkg/controllers/state/informer/nodepool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/event"
"sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
Expand Down Expand Up @@ -64,12 +63,10 @@ func (c *NodePoolController) Reconcile(ctx context.Context, np *v1.NodePool) (re
}

func (c *NodePoolController) Register(ctx context.Context, m manager.Manager) error {
maxConcurrentReconciles := utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), minReconciles, maxReconciles)
log.FromContext(ctx).V(1).Info("state.nodepool maxConcurrentReconciles set", "maxConcurrentReconciles", maxConcurrentReconciles)
return controllerruntime.NewControllerManagedBy(m).
Named("state.nodepool").
For(&v1.NodePool{}, builder.WithPredicates(nodepoolutils.IsManagedPredicateFuncs(c.cloudProvider))).
WithOptions(controller.Options{MaxConcurrentReconciles: maxConcurrentReconciles}).
WithOptions(controller.Options{MaxConcurrentReconciles: utilscontroller.LinearScaleReconciles(utilscontroller.CPUCount(ctx), minReconciles, maxReconciles)}).
WithEventFilter(predicate.GenerationChangedPredicate{}).
WithEventFilter(predicate.Funcs{DeleteFunc: func(event event.DeleteEvent) bool { return false }}).
Complete(reconcile.AsReconciler(m.GetClient(), c))
Expand Down
Loading
Loading