fix

Author: chrischdi

test/e2e/autoscaler.go

@@ -244,13 +244,13 @@ func AutoscalerSpec(ctx context.Context, inputGetter func() AutoscalerSpecInput)
 			WaitForMachineDeployment: input.E2EConfig.GetIntervals(specName, "wait-controllers"),
 		})
 
-		By("Deleting the MachineDeployment scale up deployment")
-		framework.DeleteScaleUpDeploymentAndWait(ctx, framework.DeleteScaleUpDeploymentAndWaitInput{
-			ClusterProxy:  workloadClusterProxy,
-			WaitForDelete: input.E2EConfig.GetIntervals(specName, "wait-autoscaler"),
-		})
-
 		if input.ScaleToAndFromZero {
+			By("Deleting the MachineDeployment scale up deployment")
+			framework.DeleteScaleUpDeploymentAndWait(ctx, framework.DeleteScaleUpDeploymentAndWaitInput{
+				ClusterProxy:  workloadClusterProxy,
+				WaitForDelete: input.E2EConfig.GetIntervals(specName, "wait-autoscaler"),
+			})
+
 			By("Enabling autoscaler for the MachineDeployment to zero")
 			// Enable autoscaler on the MachineDeployment.
 			framework.EnableAutoscalerForMachineDeploymentTopologyAndWait(ctx, framework.EnableAutoscalerForMachineDeploymentTopologyAndWaitInput{
@@ -281,12 +281,6 @@ func AutoscalerSpec(ctx context.Context, inputGetter func() AutoscalerSpecInput)
 				Replicas:                 1,
 				WaitForMachineDeployment: input.E2EConfig.GetIntervals(specName, "wait-controllers"),
 			})
-
-			By("Deleting the MachineDeployment scale up deployment")
-			framework.DeleteScaleUpDeploymentAndWait(ctx, framework.DeleteScaleUpDeploymentAndWaitInput{
-				ClusterProxy:  workloadClusterProxy,
-				WaitForDelete: input.E2EConfig.GetIntervals(specName, "wait-autoscaler"),
-			})
 		}
 
 		By("Disabling the autoscaler for MachineDeployments to test MachinePools")
@@ -296,6 +290,12 @@ func AutoscalerSpec(ctx context.Context, inputGetter func() AutoscalerSpecInput)
 			WaitForAnnotationsToBeDropped: input.E2EConfig.GetIntervals(specName, "wait-controllers"),
 		})
 
+		By("Deleting the MachineDeployment scale up deployment")
+		framework.DeleteScaleUpDeploymentAndWait(ctx, framework.DeleteScaleUpDeploymentAndWaitInput{
+			ClusterProxy:  workloadClusterProxy,
+			WaitForDelete: input.E2EConfig.GetIntervals(specName, "wait-autoscaler"),
+		})
+
 		if hasMachinePool {
 			By("Enabling autoscaler for the MachinePool")
 			// Enable autoscaler on the MachinePool.
@@ -359,13 +359,13 @@ func AutoscalerSpec(ctx context.Context, inputGetter func() AutoscalerSpecInput)
 				WaitForMachinePool: input.E2EConfig.GetIntervals(specName, "wait-controllers"),
 			})
 
-			By("Deleting the MachinePool scale up deployment")
-			framework.DeleteScaleUpDeploymentAndWait(ctx, framework.DeleteScaleUpDeploymentAndWaitInput{
-				ClusterProxy:  workloadClusterProxy,
-				WaitForDelete: input.E2EConfig.GetIntervals(specName, "wait-autoscaler"),
-			})
-
 			if input.ScaleToAndFromZero {
+				By("Deleting the MachinePool scale up deployment")
+				framework.DeleteScaleUpDeploymentAndWait(ctx, framework.DeleteScaleUpDeploymentAndWaitInput{
+					ClusterProxy:  workloadClusterProxy,
+					WaitForDelete: input.E2EConfig.GetIntervals(specName, "wait-autoscaler"),
+				})
+
 				By("Enabling autoscaler for the MachinePool to zero")
 				// Enable autoscaler on the MachinePool.
 				framework.EnableAutoscalerForMachinePoolTopologyAndWait(ctx, framework.EnableAutoscalerForMachinePoolTopologyAndWaitInput{
@@ -396,12 +396,6 @@ func AutoscalerSpec(ctx context.Context, inputGetter func() AutoscalerSpecInput)
 					Replicas:           1,
 					WaitForMachinePool: input.E2EConfig.GetIntervals(specName, "wait-controllers"),
 				})
-
-				By("Deleting the MachineDeployment scale up deployment")
-				framework.DeleteScaleUpDeploymentAndWait(ctx, framework.DeleteScaleUpDeploymentAndWaitInput{
-					ClusterProxy:  workloadClusterProxy,
-					WaitForDelete: input.E2EConfig.GetIntervals(specName, "wait-autoscaler"),
-				})
 			}
 
 			By("Disabling the autoscaler for MachineDeployments to test MachinePools")
@@ -410,6 +404,12 @@ func AutoscalerSpec(ctx context.Context, inputGetter func() AutoscalerSpecInput)
 				Cluster:                       clusterResources.Cluster,
 				WaitForAnnotationsToBeDropped: input.E2EConfig.GetIntervals(specName, "wait-controllers"),
 			})
+
+			By("Deleting the MachineDeployment scale up deployment")
+			framework.DeleteScaleUpDeploymentAndWait(ctx, framework.DeleteScaleUpDeploymentAndWaitInput{
+				ClusterProxy:  workloadClusterProxy,
+				WaitForDelete: input.E2EConfig.GetIntervals(specName, "wait-autoscaler"),
+			})
 		}
 
 		By("PASSED!")