Ignore Node when deleting by NodeRef if it doesn't exist (#816)

Author: xmudrii

pkg/controller/machine/machine.go

@@ -614,16 +614,23 @@ func (r *Reconciler) deleteNodeForMachine(machine *clusterv1alpha1.Machine) erro
 	if machine.Status.NodeRef != nil {
 		objKey := ctrlruntimeclient.ObjectKey{Name: machine.Status.NodeRef.Name}
 		node := &corev1.Node{}
+		nodeFound := true
 		if err := r.client.Get(r.ctx, objKey, node); err != nil {
-			return fmt.Errorf("failed to get node %s: %v", machine.Status.NodeRef.Name, err)
-		}
-
-		if err := r.client.Delete(r.ctx, node); err != nil {
 			if !kerrors.IsNotFound(err) {
-				return err
+				return fmt.Errorf("failed to get node %s: %v", machine.Status.NodeRef.Name, err)
 			}
+			nodeFound = false
 			klog.V(2).Infof("node %q does not longer exist for machine %q", machine.Status.NodeRef.Name, machine.Spec.Name)
 		}
+
+		if nodeFound {
+			if err := r.client.Delete(r.ctx, node); err != nil {
+				if !kerrors.IsNotFound(err) {
+					return err
+				}
+				klog.V(2).Infof("node %q does not longer exist for machine %q", machine.Status.NodeRef.Name, machine.Spec.Name)
+			}
+		}
 	} else {
 		selector, err := labels.Parse(NodeOwnerLabelName + "=" + string(machine.UID))
 		if err != nil {

pkg/controller/machine/machine_test.go

@@ -548,6 +548,25 @@ func TestControllerDeleteNodeForMachine(t *testing.T) {
 			err:              nil,
 			shouldDeleteNode: "",
 		},
+		{
+			name: "node referred by nodeRef doesn't exist",
+			machine: &clusterv1alpha1.Machine{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:       "machine-1",
+					Finalizers: []string{"machine-node-delete-finalizer"},
+				},
+				Status: clusterv1alpha1.MachineStatus{
+					NodeRef: &corev1.ObjectReference{Name: "node-1"},
+				},
+			},
+			nodes: []runtime.Object{&corev1.Node{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "node-0",
+				}},
+			},
+			err:              nil,
+			shouldDeleteNode: "",
+		},
 	}
 
 	for _, test := range tests {