Merge pull request #232 from accepting/dev

🐛 Fix init lock

Author: k8s-ci-robot

controllers/kubeadmconfig_controller.go

@@ -161,13 +161,6 @@ 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 {
 		// if it's NOT a control plane machine, requeue
 		if !util.IsControlPlaneMachine(machine) {
@@ -189,6 +182,12 @@ func (r *KubeadmConfigReconciler) Reconcile(req ctrl.Request) (_ ctrl.Result, re
 			return ctrl.Result{RequeueAfter: 30 * time.Second}, nil
 		}
 
+		defer func() {
+			if rerr != nil {
+				r.KubeadmInitLock.Unlock(ctx, cluster)
+			}
+		}()
+
 		log.Info("Creating BootstrapData for the init control plane")
 
 		// get both of ClusterConfiguration and InitConfiguration strings to pass to the cloud init control plane generator
@@ -253,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
 	}