Attach a byomachine to multiple byohost in some condition by mistake

agent/reconciler/host_reconciler.go

@@ -186,9 +186,15 @@ func (r *HostReconciler) hostCleanUp(ctx context.Context, byoHost *infrastructur
 	// Remove host reservation
 	byoHost.Status.MachineRef = nil
 
+	// Remove BootstrapSecret
+	byoHost.Spec.BootstrapSecret = nil
+
 	// Remove cluster-name label
 	delete(byoHost.Labels, clusterv1.ClusterLabelName)
 
+	// Remove Byomachine-name label
+	delete(byoHost.Labels, infrastructurev1beta1.AttachedByoMachineName)
+
 	// Remove the EndPointIP annotation
 	delete(byoHost.Annotations, infrastructurev1beta1.EndPointIPAnnotation)
 

apis/infrastructure/v1beta1/byohost_types.go

@@ -10,9 +10,10 @@ import (
 )
 
 const (
-	HostCleanupAnnotation = "byoh.infrastructure.cluster.x-k8s.io/unregistering"
-	EndPointIPAnnotation  = "byoh.infrastructure.cluster.x-k8s.io/endpointip"
-	K8sVersionAnnotation  = "byoh.infrastructure.cluster.x-k8s.io/k8sversion"
+	HostCleanupAnnotation  = "byoh.infrastructure.cluster.x-k8s.io/unregistering"
+	EndPointIPAnnotation   = "byoh.infrastructure.cluster.x-k8s.io/endpointip"
+	K8sVersionAnnotation   = "byoh.infrastructure.cluster.x-k8s.io/k8sversion"
+	AttachedByoMachineLabel = "byoh.infrastructure.cluster.x-k8s.io/byomachine-name"
 )
 
 // ByoHostSpec defines the desired state of ByoHost

controllers/infrastructure/byomachine_controller.go

@@ -122,18 +122,11 @@ func (r *ByoMachineReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	}()
 
 	// Fetch the BYOHost which is referencing this machine, if any
-	hostsList := &infrav1.ByoHostList{}
-	err = r.Client.List(
-		ctx,
-		hostsList,
-		client.MatchingFields{hostMachineRefIndex: fmt.Sprintf("%s/%s", byoMachine.Namespace, byoMachine.Name)},
-	)
+	refByoHost, err := r.FetchAttachedByoHost(ctx, byoMachine.Name, byoMachine.Namespace)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
-	var refByoHost *infrav1.ByoHost
-	if len(hostsList.Items) == 1 {
-		refByoHost = &hostsList.Items[0]
+	if refByoHost != nil {
 		logger = logger.WithValues("BYOHost", refByoHost.Name)
 	}
 
@@ -170,6 +163,30 @@ func (r *ByoMachineReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	return r.reconcileNormal(ctx, machineScope)
 }
 
+func (r *ByoMachineReconciler) FetchAttachedByoHost(ctx context.Context, byomachineName, byomachineNamespace string) (*infrav1.ByoHost, error) {
+	logger := log.FromContext(ctx)
+	logger.Info("Fetching an attached ByoHost")
+
+	selector := labels.NewSelector()
+	byohostLabels, _ := labels.NewRequirement(infrav1.AttachedByoMachineName, selection.Equals, []string{byomachineNamespace + "." + byomachineName})
+	selector = selector.Add(*byohostLabels)
+	hostsList := &infrav1.ByoHostList{}
+	err := r.Client.List(
+		ctx,
+		hostsList,
+		&client.ListOptions{LabelSelector: selector},
+	)
+	if err != nil {
+		return nil, err
+	}
+	var refByoHost *infrav1.ByoHost = nil
+	if len(hostsList.Items) == 1 {
+		refByoHost = &hostsList.Items[0]
+		logger.Info("Successfully to fetch an attached Byohost", "byohost", refByoHost.Name)
+	}
+	return refByoHost, nil
+}
+
 func (r *ByoMachineReconciler) reconcileDelete(ctx context.Context, machineScope *byoMachineScope) (reconcile.Result, error) {
 	logger := log.FromContext(ctx).WithValues("cluster", machineScope.Cluster.Name)
 	logger.Info("Deleting ByoMachine")
@@ -427,6 +444,7 @@ func (r *ByoMachineReconciler) attachByoHost(ctx context.Context, machineScope *
 		hostLabels = make(map[string]string)
 	}
 	hostLabels[clusterv1.ClusterLabelName] = machineScope.ByoMachine.Labels[clusterv1.ClusterLabelName]
+	hostLabels[infrav1.AttachedByoMachineName] = machineScope.ByoMachine.Namespace + "." + machineScope.ByoMachine.Name
 	host.Labels = hostLabels
 
 	host.Spec.BootstrapSecret = &corev1.ObjectReference{

controllers/infrastructure/byomachine_controller_test.go

@@ -11,7 +11,6 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	infrastructurev1beta1 "github.com/vmware-tanzu/cluster-api-provider-byoh/apis/infrastructure/v1beta1"
-
 	"github.com/vmware-tanzu/cluster-api-provider-byoh/test/builder"
 	eventutils "github.com/vmware-tanzu/cluster-api-provider-byoh/test/utils/events"
 	corev1 "k8s.io/api/core/v1"
@@ -248,6 +247,10 @@ var _ = Describe("Controllers/ByomachineController", func() {
 						UID:        byoMachine.UID,
 						APIVersion: byoHost.APIVersion,
 					}
+					if byoHost.Labels == nil {
+						byoHost.Labels = make(map[string]string)
+					}
+					byoHost.Labels[infrastructurev1beta1.AttachedByoMachineName] = byoMachine.Namespace + "." + byoMachine.Name
 					Expect(ph.Patch(ctx, byoHost, patch.WithStatusObservedGeneration{})).Should(Succeed())
 
 					WaitForObjectToBeUpdatedInCache(byoHost, func(object client.Object) bool {