Remove handling for orphaned VSphereMachines

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

.gitignore

@@ -75,3 +75,4 @@ _releasenotes
 *~
 *.tmp
 .DS_Store
+*ginkgo-log.txt*

controllers/vspherecluster_reconciler.go

@@ -121,10 +121,6 @@ func (r *clusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_
 		}
 	}()
 
-	if err := r.setOwnerRefsOnVsphereMachines(ctx, clusterContext); err != nil {
-		return reconcile.Result{}, errors.Wrapf(err, "failed to set owner refs on VSphereMachine objects")
-	}
-
 	// Handle deleted clusters
 	if !vsphereCluster.DeletionTimestamp.IsZero() {
 		return r.reconcileDelete(ctx, clusterContext)
@@ -158,12 +154,6 @@ func (r *clusterReconciler) reconcileDelete(ctx context.Context, clusterCtx *cap
 		log := log.WithValues("VSphereMachine", klog.KObj(vsphereMachine))
 		ctx := ctrl.LoggerInto(ctx, log)
 
-		// If the VSphereMachine is not owned by the CAPI Machine object because the machine object was deleted
-		// before setting the owner references, then proceed with the deletion of the VSphereMachine object.
-		// This is required until CAPI has a solution for https://github.com/kubernetes-sigs/cluster-api/issues/5483
-		if !clusterutilv1.IsOwnedByObject(vsphereMachine, clusterCtx.VSphereCluster) || len(vsphereMachine.OwnerReferences) != 1 {
-			continue
-		}
 		machineDeletionCount++
 		// Remove the finalizer since VM creation wouldn't proceed
 		log.Info("Removing finalizer from VSphereMachine")
@@ -528,37 +518,6 @@ func (r *clusterReconciler) isControlPlaneInitialized(ctx context.Context, clust
 	return conditions.IsTrue(clusterCtx.Cluster, clusterv1.ControlPlaneInitializedCondition)
 }
 
-func (r *clusterReconciler) setOwnerRefsOnVsphereMachines(ctx context.Context, clusterCtx *capvcontext.ClusterContext) error {
-	vsphereMachines, err := infrautilv1.GetVSphereMachinesInCluster(ctx, r.Client, clusterCtx.Cluster.Namespace, clusterCtx.Cluster.Name)
-	if err != nil {
-		return errors.Wrapf(err,
-			"unable to list VSphereMachines part of VSphereCluster %s/%s", clusterCtx.VSphereCluster.Namespace, clusterCtx.VSphereCluster.Name)
-	}
-
-	var patchErrors []error
-	for _, vsphereMachine := range vsphereMachines {
-		patchHelper, err := patch.NewHelper(vsphereMachine, r.Client)
-		if err != nil {
-			patchErrors = append(patchErrors, err)
-			continue
-		}
-
-		vsphereMachine.SetOwnerReferences(clusterutilv1.EnsureOwnerRef(
-			vsphereMachine.OwnerReferences,
-			metav1.OwnerReference{
-				APIVersion: clusterCtx.VSphereCluster.APIVersion,
-				Kind:       clusterCtx.VSphereCluster.Kind,
-				Name:       clusterCtx.VSphereCluster.Name,
-				UID:        clusterCtx.VSphereCluster.UID,
-			}))
-
-		if err := patchHelper.Patch(ctx, vsphereMachine); err != nil {
-			patchErrors = append(patchErrors, err)
-		}
-	}
-	return kerrors.NewAggregate(patchErrors)
-}
-
 func (r *clusterReconciler) reconcileClusterModules(ctx context.Context, clusterCtx *capvcontext.ClusterContext) (reconcile.Result, error) {
 	if feature.Gates.Enabled(feature.NodeAntiAffinity) {
 		return r.clusterModuleReconciler.Reconcile(ctx, clusterCtx)

controllers/vspheremachine_controller.go

@@ -199,11 +199,22 @@ func (r *machineReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_
 		log.Info("Waiting on Machine controller to set OwnerRef on VSphereMachine")
 		return reconcile.Result{}, nil
 	}
-
 	log = log.WithValues("Machine", klog.KObj(machine))
 	ctx = ctrl.LoggerInto(ctx, log)
+
 	cluster := r.fetchCAPICluster(ctx, machine, machineContext.GetVSphereMachine())
 
+	// TODO: Remove an ownerReference to the VSphereCluster if one exists. At this point we know the VSphereMachine has
+	// TODO: Do a nil check on the Cluster here.
+	// an owner CAPI Machine.
+	// if clusterutilv1.IsOwnedByObject()
+
+	if cluster != nil {
+		vsphereCluster, err := r.fetchVSphereCluster(ctx, cluster)
+		if err != nil {
+			return reconcile.Result{}, err
+		}
+	}
 	// Create the patch helper.
 	patchHelper, err := patch.NewHelper(machineContext.GetVSphereMachine(), r.Client)
 	if err != nil {
@@ -259,6 +270,17 @@ func (r *machineReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_
 	return r.reconcileNormal(ctx, machineContext)
 }
 
+func (r *machineReconciler) fetchVSphereCluster(ctx context.Context, cluster *clusterv1.Cluster) (*infrav1.VSphereCluster, error) {
+	vsphereCluster := &infrav1.VSphereCluster{}
+	if err := r.Client.Get(ctx, client.ObjectKey{
+		Namespace: cluster.Spec.InfrastructureRef.Namespace,
+		Name:      cluster.Spec.InfrastructureRef.Name,
+	}, vsphereCluster); err != nil {
+		return nil, err
+	}
+	return vsphereCluster, nil
+}
+
 func (r *machineReconciler) reconcileDelete(ctx context.Context, machineCtx capvcontext.MachineContext) (reconcile.Result, error) {
 	log := ctrl.LoggerFrom(ctx)
 

test/e2e/ownerreference_test.go

@@ -123,7 +123,7 @@ var (
 		},
 		"VSphereMachine": func(owners []metav1.OwnerReference) error {
 			// The vSphereCluster takes ownership of all vSphereMachines in addition to the core Machine.
-			return framework.HasExactOwners(owners, vSphereClusterOwner, machineController)
+			return framework.HasExactOwners(owners, machineController)
 		},
 		"VSphereMachineTemplate": func(owners []metav1.OwnerReference) error {
 			// The vSphereMachineTemplate can be owned by the Cluster or the ClusterClass.