Fix lint

Author: tchinmai7

internal/controller/linodemachine_controller.go

@@ -717,6 +717,7 @@ func (r *LinodeMachineReconciler) reconcilePreflightReady(ctx context.Context, i
 	return ctrl.Result{}, nil
 }
 
+//nolint:cyclop // making it simpler complicates things more
 func (r *LinodeMachineReconciler) reconcileUpdate(ctx context.Context, logger logr.Logger, machineScope *scope.MachineScope) (ctrl.Result, error) {
 	logger.Info("updating machine")
 	instanceID, err := util.GetInstanceID(machineScope.LinodeMachine.Spec.ProviderID)
@@ -771,6 +772,23 @@ func (r *LinodeMachineReconciler) reconcileUpdate(ctx context.Context, logger lo
 			return ctrl.Result{RequeueAfter: reconciler.DefaultMachineControllerWaitForRunningDelay}, nil
 		}
 	}
+
+	res, err := r.reconcileFirewallID(ctx, logger, machineScope)
+	if err != nil || !res.IsZero() {
+		return res, err
+	}
+
+	// Clean up bootstrap data after instance creation.
+	if linodeInstance.Status == linodego.InstanceRunning && machineScope.Machine.Status.Phase == "Running" {
+		if err := deleteBootstrapData(ctx, machineScope); err != nil {
+			logger.Error(err, "Fail to delete bootstrap data")
+		}
+	}
+
+	return ctrl.Result{}, nil
+}
+
+func (r *LinodeMachineReconciler) reconcileFirewallID(ctx context.Context, logger logr.Logger, machineScope *scope.MachineScope) (ctrl.Result, error) {
 	// get the instance's firewalls
 	firewalls, err := machineScope.LinodeClient.ListInstanceFirewalls(ctx, instanceID, nil)
 	if err != nil {
@@ -799,18 +817,10 @@ func (r *LinodeMachineReconciler) reconcileUpdate(ctx context.Context, logger lo
 		)
 		if err != nil {
 			logger.Error(err, "Failed to update firewalls for Linode instance")
-			return ctrl.Result{RequeueAfter: reconciler.DefaultMachineControllerWaitForRunningDelay}, nil
+			return nil, err
 		}
 	}
-
-	// Clean up bootstrap data after instance creation.
-	if linodeInstance.Status == linodego.InstanceRunning && machineScope.Machine.Status.Phase == "Running" {
-		if err := deleteBootstrapData(ctx, machineScope); err != nil {
-			logger.Error(err, "Fail to delete bootstrap data")
-		}
-	}
-
-	return ctrl.Result{}, nil
+	return nil, nil
 }
 
 func (r *LinodeMachineReconciler) reconcileDelete(