Merge pull request #5926 from sbueringer/pr-fix-upgrade-test

🐛 test/e2e/cluster-upgrade: skip worker upgrades if worker count is 0

Author: k8s-ci-robot

test/e2e/cluster_upgrade.go

@@ -167,19 +167,20 @@ func ClusterUpgradeConformanceSpec(ctx context.Context, inputGetter func() Clust
 				WaitForEtcdUpgrade:          input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade"),
 			})
 
-			By("Upgrading the machine deployment")
-			framework.UpgradeMachineDeploymentsAndWait(ctx, framework.UpgradeMachineDeploymentsAndWaitInput{
-				ClusterProxy:                input.BootstrapClusterProxy,
-				Cluster:                     clusterResources.Cluster,
-				UpgradeVersion:              input.E2EConfig.GetVariable(KubernetesVersionUpgradeTo),
-				MachineDeployments:          clusterResources.MachineDeployments,
-				WaitForMachinesToBeUpgraded: input.E2EConfig.GetIntervals(specName, "wait-worker-nodes"),
-			})
+			if workerMachineCount > 0 {
+				By("Upgrading the machine deployment")
+				framework.UpgradeMachineDeploymentsAndWait(ctx, framework.UpgradeMachineDeploymentsAndWaitInput{
+					ClusterProxy:                input.BootstrapClusterProxy,
+					Cluster:                     clusterResources.Cluster,
+					UpgradeVersion:              input.E2EConfig.GetVariable(KubernetesVersionUpgradeTo),
+					MachineDeployments:          clusterResources.MachineDeployments,
+					WaitForMachinesToBeUpgraded: input.E2EConfig.GetIntervals(specName, "wait-worker-nodes"),
+				})
+			}
 		}
 
-		// Only attempt to upgrade MachinePools if they were provided in the template,
-		// also adjust the expected workerMachineCount if we have MachinePools
-		if len(clusterResources.MachinePools) > 0 {
+		// Only attempt to upgrade MachinePools if they were provided in the template.
+		if len(clusterResources.MachinePools) > 0 && workerMachineCount > 0 {
 			By("Upgrading the machinepool instances")
 			framework.UpgradeMachinePoolAndWait(ctx, framework.UpgradeMachinePoolAndWaitInput{
 				ClusterProxy:                   input.BootstrapClusterProxy,

test/framework/cluster_topology_helpers.go

@@ -130,14 +130,16 @@ func UpgradeClusterTopologyAndWaitForUpgrade(ctx context.Context, input UpgradeC
 	}, input.WaitForEtcdUpgrade...)
 
 	for _, deployment := range input.MachineDeployments {
-		log.Logf("Waiting for Kubernetes versions of machines in MachineDeployment %s/%s to be upgraded to %s",
-			deployment.Namespace, deployment.Name, input.KubernetesUpgradeVersion)
-		WaitForMachineDeploymentMachinesToBeUpgraded(ctx, WaitForMachineDeploymentMachinesToBeUpgradedInput{
-			Lister:                   mgmtClient,
-			Cluster:                  input.Cluster,
-			MachineCount:             int(*deployment.Spec.Replicas),
-			KubernetesUpgradeVersion: input.KubernetesUpgradeVersion,
-			MachineDeployment:        *deployment,
-		}, input.WaitForMachinesToBeUpgraded...)
+		if *deployment.Spec.Replicas > 0 {
+			log.Logf("Waiting for Kubernetes versions of machines in MachineDeployment %s/%s to be upgraded to %s",
+				deployment.Namespace, deployment.Name, input.KubernetesUpgradeVersion)
+			WaitForMachineDeploymentMachinesToBeUpgraded(ctx, WaitForMachineDeploymentMachinesToBeUpgradedInput{
+				Lister:                   mgmtClient,
+				Cluster:                  input.Cluster,
+				MachineCount:             int(*deployment.Spec.Replicas),
+				KubernetesUpgradeVersion: input.KubernetesUpgradeVersion,
+				MachineDeployment:        *deployment,
+			}, input.WaitForMachinesToBeUpgraded...)
+		}
 	}
 }