Ensure test env stops successfully

danail-branekov · danail-branekov · commit 87e6edc6c026 · 2026-01-05T18:08:04.000+02:00
Since commit 72d2ec7 controllers tests have been failing on concourse CI with test env failing to stop during test tear down within its default timeout (30 seconds), for example https://ci.korifi.cf-app.com/teams/main/pipelines/main/jobs/run-tests-main/builds/1884 The issue is reproducible locally when running controller tests with 8 ginkgo nodes. Running them with 2 works fine May or may not be related to kubernetes-sigs/controller-runtime#1571 This commit replaces ``` Expect(testEnv.Stop()).To(Succeed()) ``` with ``` Eventually(testEnv.Stop, "1m").Should(Succeed()) ``` to ensure that test env stops successfully
diff --git a/api/authorization/authorization_suite_test.go b/api/authorization/authorization_suite_test.go
@@ -48,7 +48,7 @@ var _ = BeforeSuite(func() {
 
 var _ = AfterSuite(func() {
 	authProvider.Stop()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
 
 func startEnvTest(apiServerExtraArgs map[string]string) {
@@ -88,7 +88,7 @@ func startEnvTest(apiServerExtraArgs map[string]string) {
 }
 
 func restartEnvTest(apiServerEtraArgs map[string]string) {
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 	startEnvTest(apiServerEtraArgs)
 }
 
diff --git a/api/repositories/conditions/conditions_suite_test.go b/api/repositories/conditions/conditions_suite_test.go
@@ -74,7 +74,7 @@ func (f *privilegedClientFactory) BuildClient(_ authorization.Info) (client.With
 }
 
 var _ = AfterSuite(func() {
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
 
 var _ = BeforeEach(func() {
diff --git a/api/repositories/k8sklient/descriptors/suite_test.go b/api/repositories/k8sklient/descriptors/suite_test.go
@@ -122,7 +122,7 @@ var _ = BeforeEach(func() {
 })
 
 var _ = AfterEach(func() {
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
 
 func createClusterRole(ctx context.Context, filename string) *rbacv1.ClusterRole {
diff --git a/api/repositories/repositories_suite_test.go b/api/repositories/repositories_suite_test.go
@@ -142,7 +142,7 @@ var _ = BeforeSuite(func() {
 })
 
 var _ = AfterSuite(func() {
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
 
 var _ = BeforeEach(func() {
diff --git a/controllers/api/v1alpha1/webhook_suite_test.go b/controllers/api/v1alpha1/webhook_suite_test.go
@@ -126,5 +126,5 @@ var _ = BeforeSuite(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClientCache()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/controllers/cleanup/cleanup_suite_test.go b/controllers/cleanup/cleanup_suite_test.go
@@ -57,7 +57,7 @@ var _ = BeforeSuite(func() {
 })
 
 var _ = AfterSuite(func() {
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
 
 func BeNotFound() gtypes.GomegaMatcher {
diff --git a/controllers/controllers/networking/domains/suite_test.go b/controllers/controllers/networking/domains/suite_test.go
@@ -78,5 +78,5 @@ var _ = BeforeEach(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClientCache()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/controllers/controllers/networking/routes/suite_test.go b/controllers/controllers/networking/routes/suite_test.go
@@ -91,5 +91,5 @@ var _ = BeforeEach(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClientCache()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/controllers/controllers/services/bindings/suite_test.go b/controllers/controllers/services/bindings/suite_test.go
@@ -84,7 +84,7 @@ var _ = BeforeSuite(func() {
 })
 
 var _ = AfterSuite(func() {
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
 
 var _ = BeforeEach(func() {
diff --git a/controllers/controllers/services/brokers/suite_test.go b/controllers/controllers/services/brokers/suite_test.go
@@ -81,7 +81,7 @@ var _ = BeforeSuite(func() {
 })
 
 var _ = AfterSuite(func() {
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
 
 var _ = BeforeEach(func() {
diff --git a/controllers/controllers/services/instances/managed/suite_test.go b/controllers/controllers/services/instances/managed/suite_test.go
@@ -82,7 +82,7 @@ var _ = BeforeSuite(func() {
 })
 
 var _ = AfterSuite(func() {
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
 
 var _ = BeforeEach(func() {
diff --git a/controllers/controllers/services/instances/upsi/suite_test.go b/controllers/controllers/services/instances/upsi/suite_test.go
@@ -88,5 +88,5 @@ var _ = BeforeSuite(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClientCache()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/controllers/controllers/services/osbapi/suite_test.go b/controllers/controllers/services/osbapi/suite_test.go
@@ -68,5 +68,5 @@ var _ = BeforeSuite(func() {
 
 var _ = AfterSuite(func() {
 	stopManager()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/controllers/controllers/workloads/apps/suite_test.go b/controllers/controllers/workloads/apps/suite_test.go
@@ -126,5 +126,5 @@ var _ = AfterEach(func() {
 })
 
 var _ = AfterSuite(func() {
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/controllers/controllers/workloads/build/buildpack/suite_test.go b/controllers/controllers/workloads/build/buildpack/suite_test.go
@@ -98,5 +98,5 @@ var _ = BeforeEach(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClientCache()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/controllers/controllers/workloads/build/docker/suite_test.go b/controllers/controllers/workloads/build/docker/suite_test.go
@@ -99,5 +99,5 @@ var _ = BeforeEach(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClientCache()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/controllers/controllers/workloads/build/suite_test.go b/controllers/controllers/workloads/build/suite_test.go
@@ -146,5 +146,5 @@ var _ = BeforeEach(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClientCache()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/controllers/controllers/workloads/env/env_suite_test.go b/controllers/controllers/workloads/env/env_suite_test.go
@@ -74,7 +74,7 @@ var _ = BeforeSuite(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClientCache()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
 
 var _ = BeforeEach(func() {
diff --git a/controllers/controllers/workloads/k8sns/suite_test.go b/controllers/controllers/workloads/k8sns/suite_test.go
@@ -80,7 +80,7 @@ var _ = BeforeEach(func() {
 
 var _ = AfterSuite(func() {
 	stopManager()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
 
 type mockFinalizer[T any, NS k8sns.NamespaceObject[T]] struct {
diff --git a/controllers/controllers/workloads/orgs/suite_test.go b/controllers/controllers/workloads/orgs/suite_test.go
@@ -106,5 +106,5 @@ var _ = BeforeEach(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClientCache()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/controllers/controllers/workloads/packages/suite_test.go b/controllers/controllers/workloads/packages/suite_test.go
@@ -102,5 +102,5 @@ var _ = BeforeEach(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClientCache()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/controllers/controllers/workloads/processes/suite_test.go b/controllers/controllers/workloads/processes/suite_test.go
@@ -97,5 +97,5 @@ var _ = BeforeEach(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClientCache()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/controllers/controllers/workloads/spaces/suite_test.go b/controllers/controllers/workloads/spaces/suite_test.go
@@ -116,7 +116,7 @@ var _ = BeforeEach(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClientCache()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
 
 func createServiceAccount(ctx context.Context, serviceAccountName, namespace string, annotations map[string]string) *corev1.ServiceAccount {
diff --git a/controllers/controllers/workloads/tasks/suite_test.go b/controllers/controllers/workloads/tasks/suite_test.go
@@ -97,5 +97,5 @@ var _ = BeforeEach(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClientCache()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/controllers/coordination/integration/integration_suite_test.go b/controllers/coordination/integration/integration_suite_test.go
@@ -45,5 +45,5 @@ var _ = BeforeSuite(func() {
 })
 
 var _ = AfterSuite(func() {
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/controllers/webhooks/common_labels/suite_test.go b/controllers/webhooks/common_labels/suite_test.go
@@ -74,5 +74,5 @@ var _ = BeforeSuite(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClientCache()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/controllers/webhooks/finalizer/suite_test.go b/controllers/webhooks/finalizer/suite_test.go
@@ -86,5 +86,5 @@ var _ = BeforeSuite(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClientCache()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/controllers/webhooks/label_indexer/suite_test.go b/controllers/webhooks/label_indexer/suite_test.go
@@ -84,5 +84,5 @@ var _ = BeforeSuite(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClientCache()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/controllers/webhooks/networking/routes/app_destinations/suite_test.go b/controllers/webhooks/networking/routes/app_destinations/suite_test.go
@@ -85,5 +85,5 @@ var _ = BeforeSuite(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClientCache()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/controllers/webhooks/version/suite_test.go b/controllers/webhooks/version/suite_test.go
@@ -82,5 +82,5 @@ var _ = BeforeSuite(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClientCache()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/controllers/webhooks/workloads/apps/suite_test.go b/controllers/webhooks/workloads/apps/suite_test.go
@@ -103,5 +103,5 @@ var _ = BeforeEach(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClientCache()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/controllers/webhooks/workloads/orgs/suite_test.go b/controllers/webhooks/workloads/orgs/suite_test.go
@@ -101,5 +101,5 @@ var _ = BeforeSuite(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClientCache()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/controllers/webhooks/workloads/packages/suite_test.go b/controllers/webhooks/workloads/packages/suite_test.go
@@ -97,5 +97,5 @@ var _ = BeforeEach(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClientCache()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/controllers/webhooks/workloads/spaces/suite_test.go b/controllers/webhooks/workloads/spaces/suite_test.go
@@ -101,5 +101,5 @@ var _ = BeforeSuite(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClientCache()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/controllers/webhooks/workloads/tasks/suite_test.go b/controllers/webhooks/workloads/tasks/suite_test.go
@@ -102,5 +102,5 @@ var _ = BeforeEach(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClientCache()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/job-task-runner/controllers/integration/suite_test.go b/job-task-runner/controllers/integration/suite_test.go
@@ -94,7 +94,7 @@ var _ = BeforeSuite(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClient()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
 
 var _ = BeforeEach(func() {
diff --git a/kpack-image-builder/controllers/suite_test.go b/kpack-image-builder/controllers/suite_test.go
@@ -121,7 +121,7 @@ var _ = BeforeSuite(func() {
 })
 
 var _ = AfterSuite(func() {
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
 
 var _ = BeforeEach(func() {
diff --git a/kpack-image-builder/controllers/webhooks/finalizer/suite_integration_test.go b/kpack-image-builder/controllers/webhooks/finalizer/suite_integration_test.go
@@ -95,5 +95,5 @@ var _ = BeforeSuite(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClientCache()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/migration/migration/suite_test.go b/migration/migration/suite_test.go
@@ -74,5 +74,5 @@ var _ = BeforeEach(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClientCache()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/statefulset-runner/controllers/integration/suite_test.go b/statefulset-runner/controllers/integration/suite_test.go
@@ -121,5 +121,5 @@ var _ = AfterEach(func() {
 })
 
 var _ = AfterSuite(func() {
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/statefulset-runner/controllers/webhooks/finalizer/suite_test.go b/statefulset-runner/controllers/webhooks/finalizer/suite_test.go
@@ -89,5 +89,5 @@ var _ = BeforeEach(func() {
 var _ = AfterSuite(func() {
 	stopManager()
 	stopClientCache()
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
diff --git a/tools/image/image_suite_test.go b/tools/image/image_suite_test.go
@@ -112,6 +112,6 @@ var _ = BeforeSuite(func() {
 
 var _ = AfterSuite(func() {
 	if k8sConfig != nil {
-		Expect(testEnv.Stop()).To(Succeed())
+		Eventually(testEnv.Stop, "1m").Should(Succeed())
 	}
 })
diff --git a/tools/k8s/k8s_suite_test.go b/tools/k8s/k8s_suite_test.go
@@ -40,7 +40,7 @@ var _ = BeforeSuite(func() {
 })
 
 var _ = AfterSuite(func() {
-	Expect(testEnv.Stop()).To(Succeed())
+	Eventually(testEnv.Stop, "1m").Should(Succeed())
 })
 
 var _ = BeforeEach(func() {

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ var _ = BeforeSuite(func() {`
`48`	`48`
`49`	`49`	`var _ = AfterSuite(func() {`
`50`	`50`	`authProvider.Stop()`
`51`		`- Expect(testEnv.Stop()).To(Succeed())`
	`51`	`+ Eventually(testEnv.Stop, "1m").Should(Succeed())`
`52`	`52`	`})`
`53`	`53`
`54`	`54`	`func startEnvTest(apiServerExtraArgs map[string]string) {`
`@@ -88,7 +88,7 @@ func startEnvTest(apiServerExtraArgs map[string]string) {`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`func restartEnvTest(apiServerEtraArgs map[string]string) {`
`91`		`- Expect(testEnv.Stop()).To(Succeed())`
	`91`	`+ Eventually(testEnv.Stop, "1m").Should(Succeed())`
`92`	`92`	`startEnvTest(apiServerEtraArgs)`
`93`	`93`	`}`
`94`	`94`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ func (f *privilegedClientFactory) BuildClient(_ authorization.Info) (client.With`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`var _ = AfterSuite(func() {`
`77`		`- Expect(testEnv.Stop()).To(Succeed())`
	`77`	`+ Eventually(testEnv.Stop, "1m").Should(Succeed())`
`78`	`78`	`})`
`79`	`79`
`80`	`80`	`var _ = BeforeEach(func() {`