Minor fixes

Author: Sedef

controlplane/kubeadm/controllers/controller.go

@@ -291,7 +291,7 @@ func (r *KubeadmControlPlaneReconciler) reconcile(ctx context.Context, cluster *
 	}
 
 	controlPlane, err := r.createControlPlane(ctx, cluster, kcp)
-	if controlPlane == nil || err != nil {
+	if err != nil {
 		logger.Error(err, "failed to initialize control plane")
 		return ctrl.Result{}, err
 	}
@@ -403,7 +403,7 @@ func (r *KubeadmControlPlaneReconciler) reconcileDelete(ctx context.Context, clu
 	logger.Info("Reconcile KubeadmControlPlane deletion")
 
 	controlPlane, err := r.createControlPlane(ctx, cluster, kcp)
-	if controlPlane == nil || err != nil {
+	if err != nil {
 		logger.Error(err, "failed to initialize control plane")
 		return ctrl.Result{}, err
 	}
@@ -413,6 +413,7 @@ func (r *KubeadmControlPlaneReconciler) reconcileDelete(ctx context.Context, clu
 	r.managementCluster.TargetClusterControlPlaneHealthCheck(ctx, controlPlane, util.ObjectKey(cluster)) //nolint
 	r.managementCluster.TargetClusterEtcdHealthCheck(ctx, controlPlane, util.ObjectKey(cluster)) //nolint
 
+	// Gets all machines, not just control plane machines.
 	allMachines, err := r.managementCluster.GetMachinesForCluster(ctx, util.ObjectKey(cluster))
 	if err != nil {
 		return ctrl.Result{}, err

controlplane/kubeadm/internal/workload_cluster_etcd.go

@@ -99,8 +99,7 @@ func (w *Workload) EtcdIsHealthy(ctx context.Context, controlPlane *ControlPlane
 		}
 		defer etcdClient.Close()
 
-		err = etcdClient.HealthCheck(ctx)
-		if err != nil {
+		if err := etcdClient.HealthCheck(ctx); err != nil {
 			response[name] = errors.Wrap(err, "etcd member is unhealthy")
 			continue
 		}