Merge pull request #8044 from sbueringer/pr-machine-controller-envtest

🌱 Move machine controller tests to envtest, drop disableNodeLabelSync

Author: k8s-ci-robot

internal/controllers/machine/machine_controller.go

@@ -91,11 +91,6 @@ type Reconciler struct {
 	// nodeDeletionRetryTimeout determines how long the controller will retry deleting a node
 	// during a single reconciliation.
 	nodeDeletionRetryTimeout time.Duration
-
-	// disableNodeLabelSync should only be used for tests. This is used to skip the parts of
-	// the controller that need SSA as the current test setup does not support SSA.
-	// This flag should be dropped after the tests are migrated to envtest.
-	disableNodeLabelSync bool
 }
 
 func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {

internal/controllers/machine/machine_controller_noderef.go

@@ -124,15 +124,13 @@ func (r *Reconciler) reconcileNode(ctx context.Context, cluster *clusterv1.Clust
 		}
 	}
 
-	if !r.disableNodeLabelSync {
-		options := []client.PatchOption{
-			client.FieldOwner("capi-machine"),
-			client.ForceOwnership,
-		}
-		nodePatch := unstructuredNode(node.Name, node.UID, getManagedLabels(machine.Labels))
-		if err := remoteClient.Patch(ctx, nodePatch, client.Apply, options...); err != nil {
-			return ctrl.Result{}, errors.Wrap(err, "failed to apply patch label to the node")
-		}
+	options := []client.PatchOption{
+		client.FieldOwner("capi-machine"),
+		client.ForceOwnership,
+	}
+	nodePatch := unstructuredNode(node.Name, node.UID, getManagedLabels(machine.Labels))
+	if err := remoteClient.Patch(ctx, nodePatch, client.Apply, options...); err != nil {
+		return ctrl.Result{}, errors.Wrap(err, "failed to apply patch label to the node")
 	}
 
 	// Do the remaining node health checks, then set the node health to true if all checks pass.