refresh MP

Author: Cecile Robert-Michon

test/framework/machinepool_helpers.go

@@ -144,11 +144,12 @@ func UpgradeMachinePoolAndWait(ctx context.Context, input UpgradeMachinePoolAndW
 		log.Logf("Waiting for Kubernetes versions of machines in MachinePool %s/%s to be upgraded from %s to %s",
 			mp.Namespace, mp.Name, *oldVersion, input.UpgradeVersion)
 		WaitForMachinePoolInstancesToBeUpgraded(ctx, WaitForMachinePoolInstancesToBeUpgradedInput{
-			Getter:                   input.ClusterProxy.GetWorkloadCluster(ctx, input.Cluster.Namespace, input.Cluster.Name).GetClient(),
+			Getter:                   mgmtClient,
+			WorkloadClusterGetter:    input.ClusterProxy.GetWorkloadCluster(ctx, input.Cluster.Namespace, input.Cluster.Name).GetClient(),
 			Cluster:                  input.Cluster,
 			MachineCount:             int(*mp.Spec.Replicas),
 			KubernetesUpgradeVersion: input.UpgradeVersion,
-			MachinePool:              *mp,
+			MachinePool:              mp,
 		}, input.WaitForMachinePoolToBeUpgraded...)
 	}
 }
@@ -189,10 +190,11 @@ func ScaleMachinePoolAndWait(ctx context.Context, input ScaleMachinePoolAndWaitI
 // WaitForMachinePoolInstancesToBeUpgradedInput is the input for WaitForMachinePoolInstancesToBeUpgraded.
 type WaitForMachinePoolInstancesToBeUpgradedInput struct {
 	Getter                   Getter
+	WorkloadClusterGetter    Getter
 	Cluster                  *clusterv1.Cluster
 	KubernetesUpgradeVersion string
 	MachineCount             int
-	MachinePool              clusterv1exp.MachinePool
+	MachinePool              *clusterv1exp.MachinePool
 }
 
 // WaitForMachinePoolInstancesToBeUpgraded waits until all instances belonging to a MachinePool are upgraded to the correct kubernetes version.
@@ -206,6 +208,13 @@ func WaitForMachinePoolInstancesToBeUpgraded(ctx context.Context, input WaitForM
 
 	log.Logf("Ensuring all MachinePool Instances have upgraded kubernetes version %s", input.KubernetesUpgradeVersion)
 	Eventually(func() (int, error) {
+		nn := client.ObjectKey{
+			Namespace: input.MachinePool.Namespace,
+			Name:      input.MachinePool.Name,
+		}
+		if err := input.Getter.Get(ctx, nn, input.MachinePool); err != nil {
+			return 0, err
+		}
 		versions := getMachinePoolInstanceVersions(ctx, GetMachinesPoolInstancesInput{
 			Getter:      input.Getter,
 			Namespace:   input.Cluster.Namespace,
@@ -231,7 +240,7 @@ func WaitForMachinePoolInstancesToBeUpgraded(ctx context.Context, input WaitForM
 type GetMachinesPoolInstancesInput struct {
 	Getter      Getter
 	Namespace   string
-	MachinePool clusterv1exp.MachinePool
+	MachinePool *clusterv1exp.MachinePool
 }
 
 // getMachinePoolInstanceVersions returns the Kubernetes versions of the machine pool instances.