Add MP name label to DockerMachine to skip bootstrap

Author: Jont828

test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller.go

@@ -300,7 +300,7 @@ func (r *DockerMachinePoolReconciler) reconcileNormal(ctx context.Context, clust
 	}
 
 	// Create a DockerMachine for each instance returned by the node pool if it doesn't exist.
-	if err := r.CreateDockerMachinesIfNotExists(ctx, dockerMachinePool, nodePoolInstancesResult); err != nil {
+	if err := r.CreateDockerMachinesIfNotExists(ctx, machinePool, dockerMachinePool, nodePoolInstancesResult); err != nil {
 		conditions.MarkFalse(dockerMachinePool, clusterv1.ReadyCondition, "FailedToCreateNewMachines", clusterv1.ConditionSeverityWarning, err.Error())
 		return ctrl.Result{}, errors.Wrap(err, "failed to create missing machines")
 	}
@@ -374,7 +374,7 @@ func (r *DockerMachinePoolReconciler) DeleteDanglingDockerMachines(ctx context.C
 }
 
 // CreateDockerMachinesIfNotExists creates a DockerMachine for each instance returned by the node pool if it doesn't exist.
-func (r *DockerMachinePoolReconciler) CreateDockerMachinesIfNotExists(ctx context.Context, dockerMachinePool *infraexpv1.DockerMachinePool, instances []docker.NodePoolInstance) error {
+func (r *DockerMachinePoolReconciler) CreateDockerMachinesIfNotExists(ctx context.Context, machinePool *expv1.MachinePool, dockerMachinePool *infraexpv1.DockerMachinePool, instances []docker.NodePoolInstance) error {
 	log := ctrl.LoggerFrom(ctx)
 
 	log.V(2).Info("Creating missing machines", "dockerMachinePool", dockerMachinePool.Name, "namespace", dockerMachinePool.Namespace, "instances", instances)
@@ -391,11 +391,13 @@ func (r *DockerMachinePoolReconciler) CreateDockerMachinesIfNotExists(ctx contex
 
 	for _, instance := range instances {
 		if _, exists := instanceNameToDockerMachine[instance.InstanceName]; !exists {
+			labels := dockerMachinePool.Status.InfrastructureMachineSelector.MatchLabels
+			labels[clusterv1.MachinePoolNameLabel] = machinePool.Name
 			dockerMachine := &infrav1.DockerMachine{
 				ObjectMeta: metav1.ObjectMeta{
 					Namespace:    dockerMachinePool.Namespace,
 					GenerateName: fmt.Sprintf("%s-", dockerMachinePool.Name),
-					Labels:       dockerMachinePool.Status.InfrastructureMachineSelector.MatchLabels,
+					Labels:       labels,
 					Annotations:  make(map[string]string),
 					// Note: This DockerMachine will be owned by the DockerMachinePool until the MachinePool controller creates its parent Machine.
 				},

test/infrastructure/docker/internal/controllers/dockermachine_controller.go

@@ -223,6 +223,7 @@ func (r *DockerMachineReconciler) reconcileNormal(ctx context.Context, cluster *
 		return ctrl.Result{}, nil
 	}
 
+	// Be sure to include the MachinePool label in the DockerMachine along with the selector labels.
 	_, machinePoolOwned := dockerMachine.Labels[clusterv1.MachinePoolNameLabel]
 
 	// if the machine is already provisioned, return