Remove redundant pagination

Signed-off-by: Stefan Büringer [email protected]

Author: sbueringer

exp/internal/controllers/machinepool_controller_phases.go

@@ -559,23 +559,18 @@ func (r *MachinePoolReconciler) getNodeRefMap(ctx context.Context, c client.Clie
 	log := ctrl.LoggerFrom(ctx)
 	nodeRefsMap := make(map[string]*corev1.Node)
 	nodeList := corev1.NodeList{}
-	for {
-		if err := c.List(ctx, &nodeList, client.Continue(nodeList.Continue)); err != nil {
-			return nil, err
-		}
-
-		for _, node := range nodeList.Items {
-			if node.Spec.ProviderID == "" {
-				log.V(2).Info("No ProviderID detected, skipping", "providerID", node.Spec.ProviderID)
-				continue
-			}
+	// Note: We don't use pagination as this is a cached client and a cached client doesn't support pagination.
+	if err := c.List(ctx, &nodeList); err != nil {
+		return nil, err
+	}
 
-			nodeRefsMap[node.Spec.ProviderID] = &node
+	for _, node := range nodeList.Items {
+		if node.Spec.ProviderID == "" {
+			log.V(2).Info("No ProviderID detected, skipping", "providerID", node.Spec.ProviderID)
+			continue
 		}
 
-		if nodeList.Continue == "" {
-			break
-		}
+		nodeRefsMap[node.Spec.ProviderID] = &node
 	}
 
 	return nodeRefsMap, nil

internal/controllers/machine/machine_controller_noderef.go

@@ -254,19 +254,14 @@ func (r *Reconciler) getNode(ctx context.Context, c client.Reader, providerID st
 	if len(nodeList.Items) == 0 {
 		// If for whatever reason the index isn't registered or available, we fallback to loop over the whole list.
 		nl := corev1.NodeList{}
-		for {
-			if err := c.List(ctx, &nl, client.Continue(nl.Continue)); err != nil {
-				return nil, err
-			}
-
-			for _, node := range nl.Items {
-				if providerID == node.Spec.ProviderID {
-					return &node, nil
-				}
-			}
+		// Note: We don't use pagination as this is a cached client and a cached client doesn't support pagination.
+		if err := c.List(ctx, &nl); err != nil {
+			return nil, err
+		}
 
-			if nl.Continue == "" {
-				break
+		for _, node := range nl.Items {
+			if providerID == node.Spec.ProviderID {
+				return &node, nil
 			}
 		}