From d067a0cfefe77cda10f27455dc9c515d7f28b88c Mon Sep 17 00:00:00 2001 From: Patryk Strusiewicz-Surmacki Date: Mon, 6 May 2024 11:35:09 +0200 Subject: [PATCH] Code cleanup in node_reconciler.go Signed-off-by: Patryk Strusiewicz-Surmacki --- pkg/reconciler/node_reconciler.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkg/reconciler/node_reconciler.go b/pkg/reconciler/node_reconciler.go index 27f981ad..22549d71 100644 --- a/pkg/reconciler/node_reconciler.go +++ b/pkg/reconciler/node_reconciler.go @@ -53,7 +53,7 @@ func NewNodeReconciler(clusterClient client.Client, logger logr.Logger, timeout } func (nr *NodeReconciler) reconcileDebounced(ctx context.Context) error { - added, deleted, err := nr.Update(ctx) + added, deleted, err := nr.update(ctx) if err != nil { return fmt.Errorf("error updating node reconciler data: %w", err) } @@ -73,14 +73,14 @@ func (nr *NodeReconciler) reconcileDebounced(ctx context.Context) error { return nil } -func (nr *NodeReconciler) Update(ctx context.Context) (added, deleted []string, err error) { +func (nr *NodeReconciler) update(ctx context.Context) (added, deleted []string, err error) { nr.Mutex.Lock() defer nr.Mutex.Unlock() timeoutCtx, cancel := context.WithTimeout(ctx, nr.timeout) defer cancel() - currentNodes, err := nr.listNodes(timeoutCtx) + currentNodes, err := ListNodes(timeoutCtx, nr.client) if err != nil { return nil, nil, fmt.Errorf("error listing nodes: %w", err) } @@ -92,10 +92,6 @@ func (nr *NodeReconciler) Update(ctx context.Context) (added, deleted []string, return added, deleted, nil } -func (nr *NodeReconciler) listNodes(ctx context.Context) (map[string]*corev1.Node, error) { - return ListNodes(ctx, nr.client) -} - func ListNodes(ctx context.Context, c client.Client) (map[string]*corev1.Node, error) { // list all nodes list := &corev1.NodeList{}