Merge pull request #624 from cheese-head/main

🐛 Fix patchErr not being checked in packetmachine_controller
kubernetes-sigs · Aug 14, 2023 · 3cd1612 · 3cd1612
2 parents e9c2ee0 + c81521e
commit 3cd1612
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/controllers/packetmachine_controller.go b/controllers/packetmachine_controller.go
@@ -310,7 +310,7 @@ func (r *PacketMachineReconciler) reconcile(ctx context.Context, machineScope *s
 		// Avoid a flickering condition between InstanceProvisionStarted and InstanceProvisionFailed if there's a persistent failure with createInstance
 		if conditions.GetReason(machineScope.PacketMachine, infrav1.DeviceReadyCondition) != infrav1.InstanceProvisionFailedReason {
 			conditions.MarkFalse(machineScope.PacketMachine, infrav1.DeviceReadyCondition, infrav1.InstanceProvisionStartedReason, clusterv1.ConditionSeverityInfo, "")
-			if patchErr := machineScope.PatchObject(ctx); err != nil {
+			if patchErr := machineScope.PatchObject(ctx); patchErr != nil {
 				log.Error(patchErr, "failed to patch conditions")
 				return ctrl.Result{}, patchErr
 			}