Cleanup

test/e2e/autoscaler.go

@@ -224,11 +224,10 @@ func AutoscalerSpec(ctx context.Context, inputGetter func() AutoscalerSpecInput)
 			WaitForAnnotationsToBeDropped: input.E2EConfig.GetIntervals(specName, "wait-controllers"),
 		})
 
-		By("Deleting the scale up deployment")
-		framework.DeleteScaleUpDeployment(ctx, framework.DeleteScaleUpDeploymentInput{
+		By("Deleting the MachineDeployment scale up deployment")
+		framework.DeleteScaleUpDeploymentAndWait(ctx, framework.DeleteScaleUpDeploymentAndWaitInput{
 			ClusterProxy:  workloadClusterProxy,
 			WaitForDelete: input.E2EConfig.GetIntervals(specName, "wait-autoscaler"),
-			Name:          "scale-up",
 		})
 
 		By("Enabling autoscaler for the MachinePool")

test/framework/autoscaler_helpers.go

@@ -220,15 +220,19 @@ func AddScaleUpDeploymentAndWait(ctx context.Context, input AddScaleUpDeployment
 	}, intervals...)
 }
 
-type DeleteScaleUpDeploymentInput struct {
+type DeleteScaleUpDeploymentAndWaitInput struct {
 	ClusterProxy  ClusterProxy
 	Name          string
 	WaitForDelete []interface{}
 }
 
-func DeleteScaleUpDeployment(ctx context.Context, input DeleteScaleUpDeploymentInput) error {
-	// Get the deployment
+func DeleteScaleUpDeploymentAndWait(ctx context.Context, input DeleteScaleUpDeploymentAndWaitInput) error {
+	By("Retrieving the scale up deployment")
 	deployment := &appsv1.Deployment{}
+	deploymentName := input.Name
+	if deploymentName == "" {
+		deploymentName = "scale-up"
+	}
 	err := input.ClusterProxy.GetClient().Get(ctx, client.ObjectKey{Name: input.Name, Namespace: metav1.NamespaceDefault}, deployment)
 	if err != nil {
 		return err