Fix watchers

Author: Jont828

exp/internal/controllers/machinepool_controller.go

@@ -372,7 +372,7 @@ func (r *MachinePoolReconciler) nodeToMachinePool(ctx context.Context, o client.
 
 // infraMachineToMachinePoolMapper is a mapper function that maps an InfraMachine to the MachinePool that owns it.
 // This is used to trigger an update of the MachinePool when a InfraMachine is changed.
-func infraMachineToMachinePoolMapper(o client.Object) []ctrl.Request {
+func infraMachineToMachinePoolMapper(_ context.Context, o client.Object) []ctrl.Request {
 	labels := o.GetLabels()
 
 	if poolName, ok := labels[clusterv1.MachinePoolNameLabel]; ok {

exp/internal/controllers/machinepool_controller_phases.go

@@ -383,9 +383,9 @@ func (r *MachinePoolReconciler) reconcileMachinePoolMachines(ctx context.Context
 		_, loaded := r.externalWatchers.LoadOrStore(infraMachine.GroupVersionKind().String(), struct{}{})
 		if !loaded && r.controller != nil {
 			log.Info("Adding watcher on external object", "groupVersionKind", infraMachine.GroupVersionKind())
+			kind := source.Kind(r.cache, infraMachine)
 			err := r.controller.Watch(
-				&source.Kind{Type: infraMachine},
-				// &handler.EnqueueRequestForOwner{OwnerType: &expv1.MachinePool{}},
+				kind,
 				handler.EnqueueRequestsFromMapFunc(infraMachineToMachinePoolMapper),
 			)
 			if err != nil {