Fix init lock

Signed-off-by: JunLi <[email protected]>

Author: accepting

controllers/kubeadmconfig_controller.go

@@ -162,14 +162,12 @@ func (r *KubeadmConfigReconciler) Reconcile(req ctrl.Request) (_ ctrl.Result, re
 		}
 	}()
 
-	holdLock := false
-	defer func() {
-		if !holdLock {
-			r.KubeadmInitLock.Unlock(ctx, cluster)
-		}
-	}()
-
 	if !cluster.Status.ControlPlaneInitialized {
+		defer func() {
+			if rerr != nil {
+				r.KubeadmInitLock.Unlock(ctx, cluster)
+			}
+		}()
 		// if it's NOT a control plane machine, requeue
 		if !util.IsControlPlaneMachine(machine) {
 			log.Info(fmt.Sprintf("Machine is not a control plane. If it should be a control plane, add `%s: true` as a label to the Machine", clusterv1.MachineControlPlaneLabelName))
@@ -254,8 +252,6 @@ func (r *KubeadmConfigReconciler) Reconcile(req ctrl.Request) (_ ctrl.Result, re
 		config.Status.BootstrapData = cloudInitData
 		config.Status.Ready = true
 
-		holdLock = true
-
 		return ctrl.Result{}, nil
 	}