Combine pre func

kubernetes-sigs · Sep 27, 2023 · 0c319f2 · 0c319f2
1 parent b3b39ba
commit 0c319f2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 29 deletions.
diff --git a/test/e2e/cluster_upgrade_runtimesdk.go b/test/e2e/cluster_upgrade_runtimesdk.go
@@ -221,6 +221,7 @@ func clusterUpgradeWithRuntimeSDKSpec(ctx context.Context, inputGetter func() cl
 			Cluster:                     clusterResources.Cluster,
 			ControlPlane:                clusterResources.ControlPlane,
 			MachineDeployments:          clusterResources.MachineDeployments,
+			MachinePools:                clusterResources.MachinePools,
 			KubernetesUpgradeVersion:    input.E2EConfig.GetVariable(KubernetesVersionUpgradeTo),
 			WaitForMachinesToBeUpgraded: input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade"),
 			WaitForKubeProxyUpgrade:     input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade"),
@@ -233,7 +234,7 @@ func clusterUpgradeWithRuntimeSDKSpec(ctx context.Context, inputGetter func() cl
 					input.E2EConfig.GetVariable(KubernetesVersionUpgradeTo),
 					input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade"))
 			},
-			PreWaitForMachineDeploymentToBeUpgraded: func() {
+			PreWaitForWorkersToBeUpgraded: func() {
 				machineSetPreflightChecksTestHandler(ctx,
 					input.BootstrapClusterProxy.GetClient(),
 					clusterRef)

diff --git a/test/framework/cluster_topology_helpers.go b/test/framework/cluster_topology_helpers.go
@@ -60,22 +60,21 @@ func GetClusterClassByName(ctx context.Context, input GetClusterClassByNameInput
 
 // UpgradeClusterTopologyAndWaitForUpgradeInput is the input type for UpgradeClusterTopologyAndWaitForUpgrade.
 type UpgradeClusterTopologyAndWaitForUpgradeInput struct {
-	ClusterProxy                            ClusterProxy
-	Cluster                                 *clusterv1.Cluster
-	ControlPlane                            *controlplanev1.KubeadmControlPlane
-	EtcdImageTag                            string
-	DNSImageTag                             string
-	MachineDeployments                      []*clusterv1.MachineDeployment
-	MachinePools                            []*expv1.MachinePool
-	KubernetesUpgradeVersion                string
-	WaitForMachinesToBeUpgraded             []interface{}
-	WaitForMachinePoolToBeUpgraded          []interface{}
-	WaitForKubeProxyUpgrade                 []interface{}
-	WaitForDNSUpgrade                       []interface{}
-	WaitForEtcdUpgrade                      []interface{}
-	PreWaitForControlPlaneToBeUpgraded      func()
-	PreWaitForMachineDeploymentToBeUpgraded func()
-	PreWaitForMachinePoolToBeUpgraded       func()
+	ClusterProxy                       ClusterProxy
+	Cluster                            *clusterv1.Cluster
+	ControlPlane                       *controlplanev1.KubeadmControlPlane
+	EtcdImageTag                       string
+	DNSImageTag                        string
+	MachineDeployments                 []*clusterv1.MachineDeployment
+	MachinePools                       []*expv1.MachinePool
+	KubernetesUpgradeVersion           string
+	WaitForMachinesToBeUpgraded        []interface{}
+	WaitForMachinePoolToBeUpgraded     []interface{}
+	WaitForKubeProxyUpgrade            []interface{}
+	WaitForDNSUpgrade                  []interface{}
+	WaitForEtcdUpgrade                 []interface{}
+	PreWaitForControlPlaneToBeUpgraded func()
+	PreWaitForWorkersToBeUpgraded      func()
 }
 
 // UpgradeClusterTopologyAndWaitForUpgrade upgrades a Cluster topology and waits for it to be upgraded.
@@ -155,12 +154,12 @@ func UpgradeClusterTopologyAndWaitForUpgrade(ctx context.Context, input UpgradeC
 		}, input.WaitForEtcdUpgrade...)
 	}
 
-	// Once the ControlPlane is upgraded we can run PreWaitForMachineDeploymentToBeUpgraded.
+	// Once the ControlPlane is upgraded we can run PreWaitForWorkersToBeUpgraded.
 	// Note: This can e.g. be used to verify the AfterControlPlaneUpgrade lifecycle hook is executed
 	// and blocking correctly.
-	if input.PreWaitForMachineDeploymentToBeUpgraded != nil {
-		log.Logf("Calling PreWaitForMachineDeploymentToBeUpgraded")
-		input.PreWaitForMachineDeploymentToBeUpgraded()
+	if input.PreWaitForWorkersToBeUpgraded != nil {
+		log.Logf("Calling PreWaitForWorkersToBeUpgraded")
+		input.PreWaitForWorkersToBeUpgraded()
 	}
 
 	for _, deployment := range input.MachineDeployments {
@@ -177,14 +176,6 @@ func UpgradeClusterTopologyAndWaitForUpgrade(ctx context.Context, input UpgradeC
 		}
 	}
 
-	// Once the ControlPlane is upgraded we can run PreWaitForMachinePoolToBeUpgraded.
-	// Note: This can e.g. be used to verify the AfterControlPlaneUpgrade lifecycle hook is executed
-	// and blocking correctly.
-	if input.PreWaitForMachinePoolToBeUpgraded != nil {
-		log.Logf("Calling PreWaitForMachinePoolToBeUpgraded")
-		input.PreWaitForMachinePoolToBeUpgraded()
-	}
-
 	for _, pool := range input.MachinePools {
 		if *pool.Spec.Replicas > 0 {
 			log.Logf("Waiting for Kubernetes versions of machines in MachinePool %s to be upgraded to %s",