Delete node on machine deletion

kubernetes-sigs · Mar 8, 2019 · 30f59c6 · 30f59c6
1 parent 9d16c16
commit 30f59c6
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/pkg/controller/machine/controller.go b/pkg/controller/machine/controller.go
@@ -154,6 +154,17 @@ func (r *ReconcileMachine) Reconcile(request reconcile.Request) (reconcile.Resul
 			return reconcile.Result{}, err
 		}
 
+		if m.Status.NodeRef != nil {
+			klog.Infof("Deleting node %q", m.Status.NodeRef.Name)
+			var node corev1.Node
+			key := client.ObjectKey{Namespace: "", Name: m.Status.NodeRef.Name}
+			if err := r.Client.Get(ctx, key, &node); err != nil {
+				klog.Warningf("Failed to get node %q for machine %q: %v", m.Status.NodeRef.Name, m.Name, err)
+			} else if err := r.Client.Delete(ctx, &node); err != nil {
+				klog.Warningf("Failed to delete node %q for machine %q: %v", m.Status.NodeRef.Name, m.Name, 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)