style: fix redundant and always nil returns

Signed-off-by: Chris Privitere <[email protected]>

Author: cprivitere

controllers/packetcluster_controller.go

@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// Package controllers contains PacketCluster controller logic.
 package controllers
 
 import (
@@ -104,10 +105,11 @@ func (r *PacketClusterReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		return r.reconcileDelete(ctx, clusterScope)
 	}
 
-	return r.reconcileNormal(ctx, clusterScope)
+	err = r.reconcileNormal(ctx, clusterScope)
+	return ctrl.Result{}, err
 }
 
-func (r *PacketClusterReconciler) reconcileNormal(ctx context.Context, clusterScope *scope.ClusterScope) (ctrl.Result, error) {
+func (r *PacketClusterReconciler) reconcileNormal(ctx context.Context, clusterScope *scope.ClusterScope) error {
 	log := ctrl.LoggerFrom(ctx).WithValues("cluster", clusterScope.Cluster.Name)
 	log.Info("Reconciling PacketCluster")
 
@@ -131,15 +133,15 @@ func (r *PacketClusterReconciler) reconcileNormal(ctx context.Context, clusterSc
 		ip, err := r.PacketClient.CreateIP(ctx, clusterScope.Namespace(), clusterScope.Name(), packetCluster.Spec.ProjectID, facility, metro)
 		if err != nil {
 			log.Error(err, "error reserving an ip")
-			return ctrl.Result{}, err
+			return err
 		}
 		clusterScope.PacketCluster.Spec.ControlPlaneEndpoint = clusterv1.APIEndpoint{
 			Host: ip.To4().String(),
 			Port: 6443,
 		}
 	case err != nil:
 		log.Error(err, "error getting cluster IP")
-		return ctrl.Result{}, err
+		return err
 	default:
 		// If there is an ElasticIP with the right tag just use it again
 		clusterScope.PacketCluster.Spec.ControlPlaneEndpoint = clusterv1.APIEndpoint{
@@ -151,14 +153,14 @@ func (r *PacketClusterReconciler) reconcileNormal(ctx context.Context, clusterSc
 	if clusterScope.PacketCluster.Spec.VIPManager == "KUBE_VIP" {
 		if err := r.PacketClient.EnableProjectBGP(ctx, packetCluster.Spec.ProjectID); err != nil {
 			log.Error(err, "error enabling bgp for project")
-			return ctrl.Result{}, err
+			return err
 		}
 	}
 
 	clusterScope.PacketCluster.Status.Ready = true
 	conditions.MarkTrue(packetCluster, infrav1.NetworkInfrastructureReadyCondition)
 
-	return ctrl.Result{}, nil
+	return nil
 }
 
 func (r *PacketClusterReconciler) reconcileDelete(_ context.Context, _ *scope.ClusterScope) (ctrl.Result, error) {

controllers/packetmachine_controller.go

@@ -143,7 +143,8 @@ func (r *PacketMachineReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 
 	// Handle deleted machines
 	if !packetmachine.ObjectMeta.DeletionTimestamp.IsZero() {
-		return r.reconcileDelete(ctx, machineScope)
+		err = r.reconcileDelete(ctx, machineScope)
+		return ctrl.Result{}, err
 	}
 
 	return r.reconcile(ctx, machineScope)
@@ -435,7 +436,7 @@ func (r *PacketMachineReconciler) reconcile(ctx context.Context, machineScope *s
 	return result, nil
 }
 
-func (r *PacketMachineReconciler) reconcileDelete(ctx context.Context, machineScope *scope.MachineScope) (ctrl.Result, error) {
+func (r *PacketMachineReconciler) reconcileDelete(ctx context.Context, machineScope *scope.MachineScope) error {
 	log := ctrl.LoggerFrom(ctx, "machine", machineScope.Machine.Name, "cluster", machineScope.Cluster.Name)
 	log.Info("Reconciling Delete PacketMachine")
 
@@ -453,13 +454,13 @@ func (r *PacketMachineReconciler) reconcileDelete(ctx context.Context, machineSc
 			packet.DefaultCreateTags(machineScope.Namespace(), machineScope.Machine.Name, machineScope.Cluster.Name),
 		)
 		if err != nil {
-			return ctrl.Result{}, err
+			return err
 		}
 
 		if dev == nil {
 			log.Info("Server not found by tags, nothing left to do")
 			controllerutil.RemoveFinalizer(packetmachine, infrav1.MachineFinalizer)
-			return ctrl.Result{}, nil
+			return nil
 		}
 
 		device = dev
@@ -474,18 +475,18 @@ func (r *PacketMachineReconciler) reconcileDelete(ctx context.Context, machineSc
 					// Probably somebody manually deleted the server from the UI or via API.
 					log.Info("Server not found by id, nothing left to do")
 					controllerutil.RemoveFinalizer(packetmachine, infrav1.MachineFinalizer)
-					return ctrl.Result{}, nil
+					return nil
 				}
 
 				if resp.StatusCode == http.StatusForbidden {
 					// When a server fails to provision it will return a 403
 					log.Info("Server appears to have failed provisioning, nothing left to do")
 					controllerutil.RemoveFinalizer(packetmachine, infrav1.MachineFinalizer)
-					return ctrl.Result{}, nil
+					return nil
 				}
 			}
 
-			return ctrl.Result{}, fmt.Errorf("error retrieving machine status %s: %w", packetmachine.Name, err)
+			return fmt.Errorf("error retrieving machine status %s: %w", packetmachine.Name, err)
 		}
 
 		device = dev
@@ -499,9 +500,9 @@ func (r *PacketMachineReconciler) reconcileDelete(ctx context.Context, machineSc
 
 	apiRequest := r.PacketClient.DevicesApi.DeleteDevice(ctx, device.GetId()).ForceDelete(force)
 	if _, err := apiRequest.Execute(); err != nil { //nolint:bodyclose // see https://github.com/timakin/bodyclose/issues/42
-		return ctrl.Result{}, fmt.Errorf("failed to delete the machine: %w", err)
+		return fmt.Errorf("failed to delete the machine: %w", err)
 	}
 
 	controllerutil.RemoveFinalizer(packetmachine, infrav1.MachineFinalizer)
-	return ctrl.Result{}, nil
+	return nil
 }