Fix e2e2 Ctrl+C cleanup

Author: josvazg

test/e2e2/ako_test.go

@@ -48,6 +48,14 @@ var _ = Describe("Atlas Operator Start and Stop test", Ordered, Label("ako-start
 		ako = runTestAKO(DefaultGlobalCredentials, control.MustEnvVar("OPERATOR_NAMESPACE"), deletionProtectionOff)
 		ako.Start(GinkgoT())
 
+		// Register cleanup - this should even when the process is interrupted with Ctrl+C
+		// AfterAll is not reliable in such cases.
+		DeferCleanup(func() {
+			if ako != nil {
+				ako.Stop(GinkgoT())
+			}
+		})
+
 		ctx = context.Background()
 		client, err := kube.NewTestClient()
 		Expect(err).To(Succeed())
@@ -57,10 +65,6 @@ var _ = Describe("Atlas Operator Start and Stop test", Ordered, Label("ako-start
 		})).To(Succeed())
 	})
 
-	_ = AfterAll(func() {
-		ako.Stop(GinkgoT())
-	})
-
 	_ = BeforeEach(func() {
 		testNamespace = &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{
 			Name: utils.RandomName("ako-ns"),

test/e2e2/flex_to_dedicated_test.go

@@ -51,18 +51,20 @@ var _ = Describe("Flex to Dedicated Upgrade", Ordered, Label("flex-to-dedicated"
 		ako = runTestAKO(DefaultGlobalCredentials, control.MustEnvVar("OPERATOR_NAMESPACE"), false)
 		ako.Start(GinkgoT())
 
+		// Register cleanup - this should even when the process is interrupted with Ctrl+C
+		// AfterAll is not reliable in such cases.
+		DeferCleanup(func() {
+			if ako != nil {
+				ako.Stop(GinkgoT())
+			}
+		})
+
 		ctx = context.Background()
 		client, err := kube.NewTestClient()
 		Expect(err).ToNot(HaveOccurred())
 		kubeClient = client
 	})
 
-	_ = AfterAll(func() {
-		if ako != nil {
-			ako.Stop(GinkgoT())
-		}
-	})
-
 	_ = BeforeEach(func() {
 		resourcePrefix = utils.RandomName("flex-to-dedicated")
 		testNamespace = &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{

test/e2e2/flexcluster_test.go

@@ -72,6 +72,14 @@ var _ = Describe("FlexCluster CRUD", Ordered, Label("flexcluster-ctlr"), func()
 		ako = runTestAKO(DefaultGlobalCredentials, control.MustEnvVar("OPERATOR_NAMESPACE"), deletionProtectionOff)
 		ako.Start(GinkgoT())
 
+		// Register cleanup - this should even when the process is interrupted with Ctrl+C
+		// AfterAll is not reliable in such cases.
+		DeferCleanup(func() {
+			if ako != nil {
+				ako.Stop(GinkgoT())
+			}
+		})
+
 		testClient, err := kube.NewTestClient()
 		Expect(err).To(Succeed())
 		kubeClient = testClient
@@ -113,26 +121,25 @@ var _ = Describe("FlexCluster CRUD", Ordered, Label("flexcluster-ctlr"), func()
 	})
 
 	_ = AfterAll(func(ctx context.Context) {
-		if kubeClient != nil && testGroup != nil {
-			By("Clean up test Group", func() {
+		By("Clean up test Group", func() {
+			if kubeClient != nil && testGroup != nil {
+
 				Expect(kubeClient.Delete(ctx, testGroup)).To(Succeed())
 				Eventually(func(g Gomega) error {
 					err := kubeClient.Get(ctx, client.ObjectKeyFromObject(testGroup), testGroup)
 					return err
 				}).WithContext(ctx).WithTimeout(5 * time.Minute).WithPolling(5 * time.Second).NotTo(Succeed())
-			})
-		}
-		if kubeClient != nil && sharedGroupNamespace != nil {
-			By("Clean up shared group namespace", func() {
+			}
+		})
+		By("Clean up shared group namespace", func() {
+			if kubeClient != nil && sharedGroupNamespace != nil {
+
 				Expect(kubeClient.Delete(ctx, sharedGroupNamespace)).To(Succeed())
 				Eventually(func(g Gomega) bool {
 					return kubeClient.Get(ctx, client.ObjectKeyFromObject(sharedGroupNamespace), sharedGroupNamespace) == nil
 				}).WithContext(ctx).WithTimeout(time.Minute).WithPolling(time.Second).To(BeFalse())
-			})
-		}
-		if ako != nil {
-			ako.Stop(GinkgoT())
-		}
+			}
+		})
 	})
 
 	_ = BeforeEach(func(ctx context.Context) {

test/e2e2/integration_test.go

@@ -58,6 +58,14 @@ var _ = Describe("Atlas Third-Party Integrations Controller", Ordered, Label("in
 		ako = runTestAKO(DefaultGlobalCredentials, control.MustEnvVar("OPERATOR_NAMESPACE"), deletionProtectionOff)
 		ako.Start(GinkgoT())
 
+		// Register cleanup - this should even when the process is interrupted with Ctrl+C
+		// AfterAll is not reliable in such cases.
+		DeferCleanup(func() {
+			if ako != nil {
+				ako.Stop(GinkgoT())
+			}
+		})
+
 		ctx = context.Background()
 		client, err := kube.NewTestClient()
 		Expect(err).To(Succeed())
@@ -67,12 +75,6 @@ var _ = Describe("Atlas Third-Party Integrations Controller", Ordered, Label("in
 		})).To(Succeed())
 	})
 
-	_ = AfterAll(func() {
-		if ako != nil {
-			ako.Stop(GinkgoT())
-		}
-	})
-
 	_ = BeforeEach(func() {
 		testNamespace = &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{
 			Name: utils.RandomName("integrations-ctlr-ns"),