Delete node on machine deletion

Author: enxebre

pkg/controller/machine/controller.go

@@ -154,6 +154,13 @@ func (r *ReconcileMachine) Reconcile(request reconcile.Request) (reconcile.Resul
 			return reconcile.Result{}, err
 		}
 
+		if m.Status.NodeRef != nil {
+			klog.Infof("Deleting node %q for machine %q", m.Status.NodeRef.Name, m.Name )
+			if err := r.deleteNode(m.Status.NodeRef.Name); err != nil {
+				return reconcile.Result{}, err
+			}
+		}
+
 		// Remove finalizer on successful deletion.
 		klog.Infof("machine object %v deletion successful, removing finalizer.", name)
 		m.ObjectMeta.Finalizers = util.Filter(m.ObjectMeta.Finalizers, clusterv1.MachineFinalizer)
@@ -238,3 +245,21 @@ func (r *ReconcileMachine) isDeleteAllowed(machine *clusterv1.Machine) bool {
 	// own machine.
 	return node.UID != machine.Status.NodeRef.UID
 }
+
+func (r *ReconcileMachine) deleteNode(name string) error {
+	var node corev1.Node
+	if err := r.Client.Get(context.Background(), client.ObjectKey{Name: name}, &node); err != nil {
+		if apierrors.IsNotFound(err) {
+			klog.Infof("Node %q not found", name)
+			return nil
+		} else {
+			klog.Errorf("Failed to get node %q: %v", name, err)
+			return err
+		}
+	} else if err := r.Client.Delete(context.Background(), &node); err != nil {
+		klog.Errorf("Failed to delete node %q : %v", name, err)
+		return err
+	}
+	klog.Infof("Deleted node %q", name)
+	return nil
+}