(ci) - fix cleanup to allow tests broken for 1.33 work

Author: camilamacedo86

test/e2e/v4/plugin_cluster_test.go

@@ -57,12 +57,15 @@ var _ = Describe("kubebuilder", func() {
 		})
 
 		AfterEach(func() {
-			By("By removing restricted namespace label")
+			By("removing restricted namespace label")
 			_ = kbc.RemoveNamespaceLabelToEnforceRestricted()
 
-			By("clean up API objects created during the test")
+			By("undeploy the project")
 			_ = kbc.Make("undeploy")
 
+			By("uninstalling the project")
+			_ = kbc.Make("uninstall")
+
 			By("removing controller image and working dir")
 			kbc.Destroy()
 		})
@@ -88,25 +91,19 @@ var _ = Describe("kubebuilder", func() {
 			GenerateV4WithoutMetrics(kbc)
 			Run(kbc, true, false, false, false, false)
 		})
-		// FIXME: This test is currently disabled because it requires to be fixed:
-		// https://github.com/kubernetes-sigs/kubebuilder/issues/4853
-		// It is not working for k8s 1.33
-		// It("should generate a runnable project with metrics protected by network policies", func() {
-		// 	 GenerateV4WithNetworkPoliciesWithoutWebhooks(kbc)
-		//	 Run(kbc, false, false, false, true, true)
-		// })
+		It("should generate a runnable project with the manager running "+
+			"as restricted and without webhooks", func() {
+			GenerateV4WithoutWebhooks(kbc)
+			Run(kbc, false, false, false, true, false)
+		})
+		It("should generate a runnable project with metrics protected by network policies", func() {
+			GenerateV4WithNetworkPoliciesWithoutWebhooks(kbc)
+			Run(kbc, false, false, false, true, true)
+		})
 		It("should generate a runnable project with webhooks and metrics protected by network policies", func() {
 			GenerateV4WithNetworkPolicies(kbc)
 			Run(kbc, true, false, false, true, true)
 		})
-		// FIXME: This test is currently disabled because it requires to be fixed:
-		// https://github.com/kubernetes-sigs/kubebuilder/issues/4853
-		// It is not working for k8s 1.33
-		// It("should generate a runnable project with the manager running "+
-		//	 "as restricted and without webhooks", func() {
-		//	 GenerateV4WithoutWebhooks(kbc)
-		//	 Run(kbc, false, false, false, true, false)
-		// })
 	})
 })
 
@@ -464,9 +461,15 @@ func getControllerName(kbc *utils.TestContext) string {
 		return nil
 	}
 	defer func() {
-		out, err := kbc.Kubectl.CommandInNamespace("describe", "all")
+		status, err := kbc.Kubectl.Get(
+			true,
+			"pods", controllerPodName, "-o", "jsonpath={.status.phase}")
 		Expect(err).NotTo(HaveOccurred())
-		_, _ = fmt.Fprintln(GinkgoWriter, out)
+		if status != "Running" {
+			out, err := kbc.Kubectl.CommandInNamespace("describe", "all")
+			Expect(err).NotTo(HaveOccurred())
+			_, _ = fmt.Fprintln(GinkgoWriter, out)
+		}
 	}()
 	Eventually(verifyControllerUp, 5*time.Minute, time.Second).Should(Succeed())
 	return controllerPodName
@@ -529,8 +532,34 @@ func getMetricsOutput(kbc *utils.TestContext) string {
 		g.Expect(err).NotTo(HaveOccurred())
 		g.Expect(status).To(Equal("Succeeded"), fmt.Sprintf("curl pod in %s status", status))
 	}
+	defer func() {
+		status, errCurl := kbc.Kubectl.Get(
+			true,
+			"pods", "curl", "-o", "jsonpath={.status.phase}")
+		Expect(errCurl).NotTo(HaveOccurred())
+		if status != "Succeeded" {
+			out, errDescribe := kbc.Kubectl.CommandInNamespace("describe", "all")
+			Expect(errDescribe).NotTo(HaveOccurred())
+			_, _ = fmt.Fprintln(GinkgoWriter, out)
+
+			out, err = kbc.Kubectl.Get(true,
+				"pods", "curl", "-o", "jsonpath={.status.phase}", "--namespace", kbc.Kubectl.Namespace)
+			Expect(err).NotTo(HaveOccurred())
+			_, _ = fmt.Fprintln(GinkgoWriter, out)
+		}
+	}()
 	Eventually(verifyCurlUp, 240*time.Second, time.Second).Should(Succeed())
 
+	By("validating that the correct ServiceAccount is being used")
+	saName := kbc.Kubectl.ServiceAccount
+	currentSAOutput, err := kbc.Kubectl.Get(
+		true,
+		"serviceaccount", saName,
+		"-o", "jsonpath={.metadata.name}",
+	)
+	Expect(err).NotTo(HaveOccurred(), "Failed to fetch the service account")
+	Expect(currentSAOutput).To(Equal(saName), "The ServiceAccount in use does not match the expected one")
+
 	By("validating that the metrics endpoint is serving as expected")
 	getCurlLogs := func(g Gomega) {
 		metricsOutput, err = kbc.Kubectl.Logs("curl")
@@ -569,16 +598,6 @@ func metricsShouldBeUnavailable(kbc *utils.TestContext) {
 	}
 	Eventually(verifyCurlUp, 240*time.Second, time.Second).Should(Succeed())
 
-	By("validating that the correct ServiceAccount is being used")
-	saName := kbc.Kubectl.ServiceAccount
-	currentSAOutput, err := kbc.Kubectl.Get(
-		true,
-		"serviceaccount", saName,
-		"-o", "jsonpath={.metadata.name}",
-	)
-	Expect(err).NotTo(HaveOccurred(), "Failed to fetch the service account")
-	Expect(currentSAOutput).To(Equal(saName), "The ServiceAccount in use does not match the expected one")
-
 	By("validating that the metrics endpoint is not working as expected")
 	getCurlLogs := func(g Gomega) {
 		metricsOutput, err := kbc.Kubectl.Logs("curl")
@@ -626,7 +645,7 @@ func cmdOptsToCreateCurlPod(kbc *utils.TestContext, token string) []string {
 
 func removeCurlPod(kbc *utils.TestContext) {
 	By("cleaning up the curl pod")
-	_, err := kbc.Kubectl.Delete(true, "pods/curl")
+	_, err := kbc.Kubectl.Delete(true, "pods/curl", "--grace-period=0", "--force")
 	Expect(err).NotTo(HaveOccurred())
 }