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

Author: camilamacedo86

test/e2e/v4/plugin_cluster_test.go

@@ -63,6 +63,9 @@ var _ = Describe("kubebuilder", func() {
 			By("clean up API objects created during the test")
 			_ = kbc.Make("undeploy")
 
+			By("clean up API objects created during the test")
+			_ = kbc.Make("uninstall")
+
 			By("removing controller image and working dir")
 			kbc.Destroy()
 		})
@@ -88,13 +91,10 @@ 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 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)
@@ -501,6 +501,13 @@ func getMetricsOutput(kbc *utils.TestContext) string {
 	)
 	Expect(err).NotTo(HaveOccurred(), "Controller-manager service should exist")
 
+	By("checking controller-manager logs to verify metrics server is up")
+	controllerPodName := getControllerName(kbc)
+	logs, err := kbc.Kubectl.Logs(controllerPodName)
+	Expect(err).NotTo(HaveOccurred(), "failed to get controller-manager logs")
+	Expect(logs).To(ContainSubstring("Serving metrics server"),
+		"controller logs should show that metrics server is up")
+
 	By("ensuring the service endpoint is ready")
 	checkServiceEndpoint := func(g Gomega) {
 		var output string
@@ -626,8 +633,25 @@ 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")
-	Expect(err).NotTo(HaveOccurred())
+	_, err := kbc.Kubectl.Delete(true, "pod", "curl")
+	Expect(err).NotTo(HaveOccurred(), "Failed to delete curl pod")
+
+	var deleted bool
+	Eventually(func() bool {
+		_, err := kbc.Kubectl.Get(true, "pod", "curl")
+		deleted = err != nil
+		return deleted
+	}, time.Minute, time.Second).Should(BeTrue(), "curl pod should be deleted within 1 minute")
+
+	if !deleted {
+		By("forcing deletion of the curl pod")
+		_, err := kbc.Kubectl.Command("delete", "pod", "curl", "--grace-period=0", "--force")
+		Expect(err).NotTo(HaveOccurred(), "Force delete of curl pod failed")
+		Eventually(func(g Gomega) {
+			_, err := kbc.Kubectl.Get(true, "pod", "curl")
+			g.Expect(err).To(HaveOccurred())
+		}, time.Minute, time.Second).Should(Succeed(), "curl pod should be deleted after force")
+	}
 }
 
 // serviceAccountToken provides a helper function that can provide you with a service account