Changed reconcile.Result to ctrl.Result

Author: Sedef

controllers/machine_controller_noderef.go

@@ -26,32 +26,32 @@ import (
 	"sigs.k8s.io/cluster-api/controllers/noderefutil"
 	"sigs.k8s.io/cluster-api/util"
 	"sigs.k8s.io/cluster-api/util/conditions"
+	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
 
 var (
 	ErrNodeNotFound = errors.New("cannot find node with matching ProviderID")
 )
 
-func (r *MachineReconciler) reconcileNode(ctx context.Context, cluster *clusterv1.Cluster, machine *clusterv1.Machine) (reconcile.Result, error) {
+func (r *MachineReconciler) reconcileNode(ctx context.Context, cluster *clusterv1.Cluster, machine *clusterv1.Machine) (ctrl.Result, error) {
 	logger := r.Log.WithValues("machine", machine.Name, "namespace", machine.Namespace)
 
 	// Check that the Machine has a valid ProviderID.
 	if machine.Spec.ProviderID == nil || *machine.Spec.ProviderID == "" {
-		logger.Info("Cannot reconcile node, the machine doesn't have a valid ProviderID yet")
+		logger.Info("Cannot reconcile Machine's Node, no valid ProviderID yet")
 		conditions.MarkFalse(machine, clusterv1.MachineNodeHealthyCondition, clusterv1.WaitingForNodeRefReason, clusterv1.ConditionSeverityInfo, "")
-		return reconcile.Result{}, nil
+		return ctrl.Result{}, nil
 	}
 
 	providerID, err := noderefutil.NewProviderID(*machine.Spec.ProviderID)
 	if err != nil {
-		return reconcile.Result{}, err
+		return ctrl.Result{}, err
 	}
 
 	remoteClient, err := r.Tracker.GetClient(ctx, util.ObjectKey(cluster))
 	if err != nil {
-		return reconcile.Result{}, err
+		return ctrl.Result{}, err
 	}
 
 	// Even if Status.NodeRef exists, continue to do the following checks to make sure Node is healthy
@@ -62,14 +62,14 @@ func (r *MachineReconciler) reconcileNode(ctx context.Context, cluster *clusterv
 			// If Status.NodeRef is not set before, node still can be in the provisioning state.
 			if machine.Status.NodeRef != nil {
 				conditions.MarkFalse(machine, clusterv1.MachineNodeHealthyCondition, clusterv1.NodeNotFoundReason, clusterv1.ConditionSeverityError, "")
-				return reconcile.Result{}, errors.Wrapf(err, "no matching Node for Machine %q in namespace %q", machine.Name, machine.Namespace)
+				return ctrl.Result{}, errors.Wrapf(err, "no matching Node for Machine %q in namespace %q", machine.Name, machine.Namespace)
 			}
 			conditions.MarkFalse(machine, clusterv1.MachineNodeHealthyCondition, clusterv1.NodeProvisioningReason, clusterv1.ConditionSeverityWarning, "")
-			return reconcile.Result{Requeue: true}, nil
+			return ctrl.Result{Requeue: true}, nil
 		}
 		logger.Error(err, "Failed to retrieve Node by ProviderID")
 		r.recorder.Event(machine, corev1.EventTypeWarning, "Failed to retrieve Node by ProviderID", err.Error())
-		return reconcile.Result{}, err
+		return ctrl.Result{}, err
 	}
 
 	// Set the Machine NodeRef.
@@ -88,11 +88,11 @@ func (r *MachineReconciler) reconcileNode(ctx context.Context, cluster *clusterv
 	status, message := summarizeNodeConditions(node)
 	if status == corev1.ConditionFalse {
 		conditions.MarkFalse(machine, clusterv1.MachineNodeHealthyCondition, clusterv1.NodeConditionsFailedReason, clusterv1.ConditionSeverityWarning, message)
-		return reconcile.Result{}, nil
+		return ctrl.Result{}, nil
 	}
 
 	conditions.MarkTrue(machine, clusterv1.MachineNodeHealthyCondition)
-	return reconcile.Result{}, nil
+	return ctrl.Result{}, nil
 }
 
 // summarizeNodeConditions summarizes a Node's conditions and returns the summary of condition statuses and concatenate failed condition messages:
@@ -162,5 +162,6 @@ func (r *MachineReconciler) getNode(c client.Reader, providerID *noderefutil.Pro
 			break
 		}
 	}
+
 	return nil, ErrNodeNotFound
 }