From c24517412a36adbb7ba60b1ded96c7fdb9e30730 Mon Sep 17 00:00:00 2001 From: willie-yao Date: Tue, 10 Oct 2023 23:29:12 +0000 Subject: [PATCH] Add WaitForMachinePoolToBeUpgraded to Self-hosted test --- test/e2e/self_hosted.go | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/test/e2e/self_hosted.go b/test/e2e/self_hosted.go index 568c4cd40426..6b55556c3ccf 100644 --- a/test/e2e/self_hosted.go +++ b/test/e2e/self_hosted.go @@ -307,18 +307,19 @@ func SelfHostedSpec(ctx context.Context, inputGetter func() SelfHostedSpecInput) // Cluster is using ClusterClass, upgrade via topology. By("Upgrading the Cluster topology") framework.UpgradeClusterTopologyAndWaitForUpgrade(ctx, framework.UpgradeClusterTopologyAndWaitForUpgradeInput{ - ClusterProxy: selfHostedClusterProxy, - Cluster: clusterResources.Cluster, - ControlPlane: clusterResources.ControlPlane, - EtcdImageTag: input.E2EConfig.GetVariable(EtcdVersionUpgradeTo), - DNSImageTag: input.E2EConfig.GetVariable(CoreDNSVersionUpgradeTo), - 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"), - WaitForDNSUpgrade: input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade"), - WaitForEtcdUpgrade: input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade"), + ClusterProxy: selfHostedClusterProxy, + Cluster: clusterResources.Cluster, + ControlPlane: clusterResources.ControlPlane, + EtcdImageTag: input.E2EConfig.GetVariable(EtcdVersionUpgradeTo), + DNSImageTag: input.E2EConfig.GetVariable(CoreDNSVersionUpgradeTo), + MachineDeployments: clusterResources.MachineDeployments, + MachinePools: clusterResources.MachinePools, + KubernetesUpgradeVersion: input.E2EConfig.GetVariable(KubernetesVersionUpgradeTo), + WaitForMachinesToBeUpgraded: input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade"), + WaitForMachinePoolToBeUpgraded: input.E2EConfig.GetIntervals(specName, "wait-machine-pool-upgrade"), + WaitForKubeProxyUpgrade: input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade"), + WaitForDNSUpgrade: input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade"), + WaitForEtcdUpgrade: input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade"), }) } else { // Cluster is not using ClusterClass, upgrade via individual resources.