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

camilamacedo86 · camilamacedo86 · commit 6a746c64137a · 2025-06-12T19:24:01.000+01:00
diff --git a/docs/book/src/cronjob-tutorial/testdata/project/test/e2e/e2e_test.go b/docs/book/src/cronjob-tutorial/testdata/project/test/e2e/e2e_test.go
@@ -233,12 +233,13 @@ var _ = Describe("Manager", Ordered, func() {
 								},
 								"runAsNonRoot": true,
 								"runAsUser": 1000,
+								"readOnlyRootFilesystem": true,	
 								"seccompProfile": {
 									"type": "RuntimeDefault"
 								}
 							}
 						}],
-						"serviceAccount": "%s"
+						"serviceAccountName": "%s"
 					}
 				}`, token, metricsServiceName, namespace, serviceAccountName))
 			_, err = utils.Run(cmd)
diff --git a/docs/book/src/getting-started/testdata/project/test/e2e/e2e_test.go b/docs/book/src/getting-started/testdata/project/test/e2e/e2e_test.go
@@ -228,12 +228,13 @@ var _ = Describe("Manager", Ordered, func() {
 								},
 								"runAsNonRoot": true,
 								"runAsUser": 1000,
+								"readOnlyRootFilesystem": true,	
 								"seccompProfile": {
 									"type": "RuntimeDefault"
 								}
 							}
 						}],
-						"serviceAccount": "%s"
+						"serviceAccountName": "%s"
 					}
 				}`, token, metricsServiceName, namespace, serviceAccountName))
 			_, err = utils.Run(cmd)
diff --git a/docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_test.go b/docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_test.go
@@ -233,12 +233,13 @@ var _ = Describe("Manager", Ordered, func() {
 								},
 								"runAsNonRoot": true,
 								"runAsUser": 1000,
+								"readOnlyRootFilesystem": true,	
 								"seccompProfile": {
 									"type": "RuntimeDefault"
 								}
 							}
 						}],
-						"serviceAccount": "%s"
+						"serviceAccountName": "%s"
 					}
 				}`, token, metricsServiceName, namespace, serviceAccountName))
 			_, err = utils.Run(cmd)
diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/test.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/test.go
@@ -391,12 +391,13 @@ var _ = Describe("Manager", Ordered, func() {
 								},
 								"runAsNonRoot": true,
 								"runAsUser": 1000,
+								"readOnlyRootFilesystem": true,	
 								"seccompProfile": {
 									"type": "RuntimeDefault"
 								}
 							}
 						}],
-						"serviceAccount": "%s"
+						"serviceAccountName": "%s"
 					}
 				}` + "`" + `, token, metricsServiceName, namespace, serviceAccountName))
 			_, err = utils.Run(cmd)
diff --git a/test/e2e/utils/test_context.go b/test/e2e/utils/test_context.go
@@ -368,6 +368,9 @@ func (t *TestContext) UninstallHelmRelease() error {
 
 	if _, err := t.Kubectl.Wait(false, "namespace", ns, "--for=delete", "--timeout=2m"); err != nil {
 		log.Printf("failed to wait for namespace deletion: %s", err)
+		if _, forceErr := t.Kubectl.Wait(false, "namespace", ns, "--grace-period=0", "--force"); forceErr != nil {
+			log.Printf("forced deletion also failed: %s", forceErr)
+		}
 	}
 
 	return nil
diff --git a/test/e2e/v4/plugin_cluster_test.go b/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,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 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)
-		// })
+		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)
+		})
 	})
 })
 
@@ -501,6 +498,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
@@ -521,14 +525,30 @@ func getMetricsOutput(kbc *utils.TestContext) string {
 	Expect(err).NotTo(HaveOccurred())
 
 	By("validating that the curl pod is running as expected")
+	var curlCheckFailed bool
 	verifyCurlUp := func(g Gomega) {
 		var status string
 		status, err = kbc.Kubectl.Get(
 			true,
-			"pods", "curl", "-o", "jsonpath={.status.phase}")
+			"pods", "curl", "-o", "jsonpath={.status.phase}",
+		)
+		if err != nil || status != "Succeeded" {
+			curlCheckFailed = true
+		}
 		g.Expect(err).NotTo(HaveOccurred())
 		g.Expect(status).To(Equal("Succeeded"), fmt.Sprintf("curl pod in %s status", status))
 	}
+
+	defer func() {
+		if curlCheckFailed {
+			By("dumping logs from failed curl pod for diagnostics")
+			logs, err := kbc.Kubectl.Logs("curl")
+			if err != nil {
+				logs = fmt.Sprintf("unable to fetch logs: %v", err)
+			}
+			_, _ = fmt.Fprintf(GinkgoWriter, "\n[DEBUG] curl pod failure logs:\n%s\n", logs)
+		}
+	}()
 	Eventually(verifyCurlUp, 240*time.Second, time.Second).Should(Succeed())
 
 	By("validating that the metrics endpoint is serving as expected")
@@ -583,7 +603,7 @@ func cmdOptsToCreateCurlPod(kbc *utils.TestContext, token string) []string {
 	//nolint:lll
 	cmdOpts := []string{
 		"run", "curl",
-		"--restart=Never",
+		"--restart=OnFailure",
 		"--namespace", kbc.Kubectl.Namespace,
 		"--image=curlimages/curl:latest",
 		"--overrides",
@@ -602,12 +622,13 @@ func cmdOptsToCreateCurlPod(kbc *utils.TestContext, token string) []string {
 						},
 						"runAsNonRoot": true,
 						"runAsUser": 1000,
+						"readOnlyRootFilesystem": true,
 						"seccompProfile": {
 							"type": "RuntimeDefault"
 						}
 					}
 				}],
-				"serviceAccount": "%s"
+				"serviceAccountName": "%s"
 			}
     }`, token, kbc.TestSuffix, kbc.Kubectl.Namespace, kbc.Kubectl.ServiceAccount),
 	}
@@ -616,8 +637,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
diff --git a/testdata/project-v4-multigroup/test/e2e/e2e_test.go b/testdata/project-v4-multigroup/test/e2e/e2e_test.go
@@ -228,12 +228,13 @@ var _ = Describe("Manager", Ordered, func() {
 								},
 								"runAsNonRoot": true,
 								"runAsUser": 1000,
+								"readOnlyRootFilesystem": true,	
 								"seccompProfile": {
 									"type": "RuntimeDefault"
 								}
 							}
 						}],
-						"serviceAccount": "%s"
+						"serviceAccountName": "%s"
 					}
 				}`, token, metricsServiceName, namespace, serviceAccountName))
 			_, err = utils.Run(cmd)
diff --git a/testdata/project-v4-with-plugins/test/e2e/e2e_test.go b/testdata/project-v4-with-plugins/test/e2e/e2e_test.go
@@ -228,12 +228,13 @@ var _ = Describe("Manager", Ordered, func() {
 								},
 								"runAsNonRoot": true,
 								"runAsUser": 1000,
+								"readOnlyRootFilesystem": true,	
 								"seccompProfile": {
 									"type": "RuntimeDefault"
 								}
 							}
 						}],
-						"serviceAccount": "%s"
+						"serviceAccountName": "%s"
 					}
 				}`, token, metricsServiceName, namespace, serviceAccountName))
 			_, err = utils.Run(cmd)
diff --git a/testdata/project-v4/test/e2e/e2e_test.go b/testdata/project-v4/test/e2e/e2e_test.go
@@ -228,12 +228,13 @@ var _ = Describe("Manager", Ordered, func() {
 								},
 								"runAsNonRoot": true,
 								"runAsUser": 1000,
+								"readOnlyRootFilesystem": true,	
 								"seccompProfile": {
 									"type": "RuntimeDefault"
 								}
 							}
 						}],
-						"serviceAccount": "%s"
+						"serviceAccountName": "%s"
 					}
 				}`, token, metricsServiceName, namespace, serviceAccountName))
 			_, err = utils.Run(cmd)

Original file line number	Diff line number	Diff line change
`@@ -233,12 +233,13 @@ var _ = Describe("Manager", Ordered, func() {`
`233`	`233`	`},`
`234`	`234`	`"runAsNonRoot": true,`
`235`	`235`	`"runAsUser": 1000,`
	`236`	`+ "readOnlyRootFilesystem": true,`
`236`	`237`	`"seccompProfile": {`
`237`	`238`	`"type": "RuntimeDefault"`
`238`	`239`	`}`
`239`	`240`	`}`
`240`	`241`	`}],`
`241`		`- "serviceAccount": "%s"`
	`242`	`+ "serviceAccountName": "%s"`
`242`	`243`	`}`
`243`	`244`	}`, token, metricsServiceName, namespace, serviceAccountName))
`244`	`245`	`_, err = utils.Run(cmd)`
Original file line number	Diff line number	Diff line change
`@@ -228,12 +228,13 @@ var _ = Describe("Manager", Ordered, func() {`
`228`	`228`	`},`
`229`	`229`	`"runAsNonRoot": true,`
`230`	`230`	`"runAsUser": 1000,`
	`231`	`+ "readOnlyRootFilesystem": true,`
`231`	`232`	`"seccompProfile": {`
`232`	`233`	`"type": "RuntimeDefault"`
`233`	`234`	`}`
`234`	`235`	`}`
`235`	`236`	`}],`
`236`		`- "serviceAccount": "%s"`
	`237`	`+ "serviceAccountName": "%s"`
`237`	`238`	`}`
`238`	`239`	}`, token, metricsServiceName, namespace, serviceAccountName))
`239`	`240`	`_, err = utils.Run(cmd)`
Original file line number	Diff line number	Diff line change
`@@ -391,12 +391,13 @@ var _ = Describe("Manager", Ordered, func() {`
`391`	`391`	`},`
`392`	`392`	`"runAsNonRoot": true,`
`393`	`393`	`"runAsUser": 1000,`
	`394`	`+ "readOnlyRootFilesystem": true,`
`394`	`395`	`"seccompProfile": {`
`395`	`396`	`"type": "RuntimeDefault"`
`396`	`397`	`}`
`397`	`398`	`}`
`398`	`399`	`}],`
`399`		`- "serviceAccount": "%s"`
	`400`	`+ "serviceAccountName": "%s"`
`400`	`401`	`}`
`401`	`402`	}` + "`" + `, token, metricsServiceName, namespace, serviceAccountName))
`402`	`403`	`_, err = utils.Run(cmd)`
Original file line number	Diff line number	Diff line change
`@@ -368,6 +368,9 @@ func (t *TestContext) UninstallHelmRelease() error {`
`368`	`368`
`369`	`369`	`if _, err := t.Kubectl.Wait(false, "namespace", ns, "--for=delete", "--timeout=2m"); err != nil {`
`370`	`370`	`log.Printf("failed to wait for namespace deletion: %s", err)`
	`371`	`+ if _, forceErr := t.Kubectl.Wait(false, "namespace", ns, "--grace-period=0", "--force"); forceErr != nil {`
	`372`	`+ log.Printf("forced deletion also failed: %s", forceErr)`
	`373`	`+ }`
`371`	`374`	`}`
`372`	`375`
`373`	`376`	`return nil`