Merge pull request #3379 from sedefsavas/revert-3343

Revert #3343 e2e test changes

test/e2e/data/e2e_conf.yaml

@@ -303,4 +303,3 @@ intervals:
   default/wait-machine-pool-upgrade: [ "50m", "10s" ]
   default/wait-create-identity: ["1m", "10s"]
   default/wait-job: ["10m", "10s"]
-  default/wait-create-service: ["60s", "10s"]

test/e2e/data/e2e_eks_conf.yaml

@@ -236,4 +236,3 @@ intervals:
   default/wait-control-plane-upgrade: ["35m", "30s"]
   default/wait-addon-status: ["10m", "30s"]
   default/wait-create-identity: ["1m", "10s"]
-  default/wait-create-service: ["60s", "10s"]

test/e2e/suites/managed/eks_test.go

@@ -110,7 +110,6 @@ var _ = ginkgo.Describe("[managed] [general] EKS cluster tests", func() {
 				AWSSession:            e2eCtx.BootstrapUserAWSSession,
 				Namespace:             namespace,
 				ClusterName:           clusterName,
-				IncludeLBTest:         true,
 				Replicas:              1,
 				Cleanup:               true,
 			}
@@ -125,7 +124,6 @@ var _ = ginkgo.Describe("[managed] [general] EKS cluster tests", func() {
 				AWSSession:            e2eCtx.BootstrapUserAWSSession,
 				Namespace:             namespace,
 				ClusterName:           clusterName,
-				IncludeLBTest:         true,
 				IncludeScaling:        true,
 				Cleanup:               true,
 			}
@@ -138,6 +136,7 @@ var _ = ginkgo.Describe("[managed] [general] EKS cluster tests", func() {
 			Name:      clusterName,
 		})
 		Expect(cluster).NotTo(BeNil(), "couldn't find CAPI cluster")
+
 		framework.DeleteCluster(ctx, framework.DeleteClusterInput{
 			Deleter: e2eCtx.Environment.BootstrapClusterProxy.GetClient(),
 			Cluster: cluster,

test/e2e/suites/managed/machine_deployment.go

@@ -23,17 +23,14 @@ import (
 	"context"
 
 	"github.com/aws/aws-sdk-go/aws/client"
-	"github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/pointer"
 
 	"sigs.k8s.io/cluster-api-provider-aws/test/e2e/shared"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/test/framework"
 	"sigs.k8s.io/cluster-api/test/framework/clusterctl"
-	"sigs.k8s.io/cluster-api/util"
 )
 
 // MachineDeploymentSpecInput is the input for MachineDeploymentSpec.
@@ -45,7 +42,6 @@ type MachineDeploymentSpecInput struct {
 	Namespace             *corev1.Namespace
 	Replicas              int64
 	ClusterName           string
-	IncludeLBTest         bool
 	Cleanup               bool
 }
 
@@ -96,26 +92,17 @@ func MachineDeploymentSpec(ctx context.Context, inputGetter func() MachineDeploy
 		StatusChecks: statusChecks,
 	}
 	framework.WaitForMachineStatusCheck(ctx, machineStatusInput, input.E2EConfig.GetIntervals("", "wait-machine-status")...)
-	if input.IncludeLBTest {
-		clusterClient := e2eCtx.Environment.BootstrapClusterProxy.GetWorkloadCluster(ctx, input.Namespace.Name, input.ClusterName).GetClient()
-		ginkgo.By("Creating the Nginx deployment")
-		deploymentName := "test-deployment-" + util.RandomString(6)
-		shared.CreateDefaultNginxDeployment(metav1.NamespaceDefault, deploymentName, clusterClient)
-		ginkgo.By("Creating the LB service")
-		lbServiceName := "test-svc-" + util.RandomString(6)
-		elbName := shared.CreateLBService(e2eCtx, metav1.NamespaceDefault, lbServiceName, clusterClient)
-		shared.VerifyElbExists(e2eCtx, elbName, true)
-		ginkgo.By("Deleting the Nginx deployment")
-		shared.DeleteDefaultNginxDeployment(metav1.NamespaceDefault, deploymentName, clusterClient)
-		ginkgo.By("Deleting LB service")
-		shared.DeleteLBService(metav1.NamespaceDefault, lbServiceName, clusterClient)
-	}
 
 	if input.Cleanup {
 		deleteMachineDeployment(ctx, deleteMachineDeploymentInput{
 			Deleter:           input.BootstrapClusterProxy.GetClient(),
 			MachineDeployment: md[0],
 		})
+		// deleteMachine(ctx, deleteMachineInput{
+		// 	Deleter: input.BootstrapClusterProxy.GetClient(),
+		// 	Machine: &workerMachines[0],
+		// })
+
 		waitForMachineDeploymentDeleted(ctx, waitForMachineDeploymentDeletedInput{
 			Getter:            input.BootstrapClusterProxy.GetClient(),
 			MachineDeployment: md[0],

test/e2e/suites/managed/machine_pool.go

@@ -26,13 +26,11 @@ import (
 	"github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/pointer"
 
 	"sigs.k8s.io/cluster-api-provider-aws/test/e2e/shared"
 	"sigs.k8s.io/cluster-api/test/framework"
 	"sigs.k8s.io/cluster-api/test/framework/clusterctl"
-	"sigs.k8s.io/cluster-api/util"
 )
 
 // ManagedMachinePoolSpecInput is the input for ManagedMachinePoolSpec.
@@ -44,7 +42,6 @@ type ManagedMachinePoolSpecInput struct {
 	Namespace             *corev1.Namespace
 	ClusterName           string
 	IncludeScaling        bool
-	IncludeLBTest         bool
 	Cleanup               bool
 }
 
@@ -106,21 +103,6 @@ func ManagedMachinePoolSpec(ctx context.Context, inputGetter func() ManagedMachi
 		})
 	}
 
-	if input.IncludeLBTest {
-		clusterClient := e2eCtx.Environment.BootstrapClusterProxy.GetWorkloadCluster(ctx, input.Namespace.Name, input.ClusterName).GetClient()
-		ginkgo.By("Creating the Nginx deployment")
-		deploymentName := "test-deployment-" + util.RandomString(6)
-		shared.CreateDefaultNginxDeployment(metav1.NamespaceDefault, deploymentName, clusterClient)
-		ginkgo.By("Creating the LB service")
-		lbServiceName := "test-svc-" + util.RandomString(6)
-		elbName := shared.CreateLBService(e2eCtx, metav1.NamespaceDefault, lbServiceName, clusterClient)
-		shared.VerifyElbExists(e2eCtx, elbName, true)
-		ginkgo.By("Deleting the Nginx deployment")
-		shared.DeleteDefaultNginxDeployment(metav1.NamespaceDefault, deploymentName, clusterClient)
-		ginkgo.By("Deleting LB service")
-		shared.DeleteLBService(metav1.NamespaceDefault, lbServiceName, clusterClient)
-	}
-
 	if input.Cleanup {
 		deleteMachinePool(ctx, deleteMachinePoolInput{
 			Deleter:     input.BootstrapClusterProxy.GetClient(),