fix: attempt etcd leave before deleting a Machine

smira · smira · commit 7f8e2be69ef4 · 2023-08-25T16:32:47.000+04:00
With Sidero Metal, deleting a machine leads to a super fast power down,
and etcd leave doesn't have time to run, which breaks scaling down
`2-&gt;1`.

Signed-off-by: Andrey Smirnov &lt;andrey.smirnov@siderolabs.com&gt;
diff --git a/controllers/scale.go b/controllers/scale.go
@@ -120,13 +120,14 @@ func (r *TalosControlPlaneReconciler) scaleDownControlPlane(
 
 	r.Log.Info("deleting machine", "machine", deleteMachine.Name, "node", node.Name)
 
+	leaveErr := r.gracefulEtcdLeave(ctx, c, util.ObjectKey(cluster), *deleteMachine)
+
 	err = r.Client.Delete(ctx, deleteMachine)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
 
-	err = r.gracefulEtcdLeave(ctx, c, util.ObjectKey(cluster), *deleteMachine)
-	if err != nil {
+	if leaveErr != nil {
 		return ctrl.Result{}, err
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -120,13 +120,14 @@ func (r *TalosControlPlaneReconciler) scaleDownControlPlane(`
`120`	`120`
`121`	`121`	`r.Log.Info("deleting machine", "machine", deleteMachine.Name, "node", node.Name)`
`122`	`122`
	`123`	`+ leaveErr := r.gracefulEtcdLeave(ctx, c, util.ObjectKey(cluster), *deleteMachine)`
	`124`	`+`
`123`	`125`	`err = r.Client.Delete(ctx, deleteMachine)`
`124`	`126`	`if err != nil {`
`125`	`127`	`return ctrl.Result{}, err`
`126`	`128`	`}`
`127`	`129`
`128`		`- err = r.gracefulEtcdLeave(ctx, c, util.ObjectKey(cluster), *deleteMachine)`
`129`		`- if err != nil {`
	`130`	`+ if leaveErr != nil {`
`130`	`131`	`return ctrl.Result{}, err`
`131`	`132`	`}`
`132`	`133`