Revert "Fix errors during envtest teardown"

`make test` is leaking the kube-apiserver and etcd processes.
When unoticed, this causes `make test` to fail with weird
errors like failing to open a file because of rlimit.

Investigation leads to commit 053f866 which was added
to work around the very same problems at the time according to
Pradipta. Reverting this commit fixes the issue.

It seems that updates to the controller-runtime and deps might
have changed something and we no longer need the workaround.

Let's just revert 053f866.

Fixes https://issues.redhat.com/browse/KATA-2168

Signed-off-by: Greg Kurz <groug@kaod.org>

controllers/suite_test.go

@@ -20,11 +20,9 @@ import (
 	"os"
 	"path/filepath"
 	"testing"
-	"time"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"github.com/onsi/gomega/gexec"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes/scheme"
@@ -113,15 +111,7 @@ var _ = BeforeSuite(func() {
 	Expect(err).ToNot(HaveOccurred())
 
 	go func() {
-		defer GinkgoRecover()
 		err = k8sManager.Start(ctrl.SetupSignalHandler())
-		Expect(err).ToNot(HaveOccurred(), "failed to run manager")
-		gexec.KillAndWait(4 * time.Second)
-
-		// Teardown the test environment once controller is fnished.
-		// Otherwise from Kubernetes 1.21+, teardon timeouts waiting on
-		// kube-apiserver to return
-		err := testEnv.Stop()
 		Expect(err).ToNot(HaveOccurred())
 	}()
 
@@ -131,4 +121,6 @@ var _ = BeforeSuite(func() {
 
 var _ = AfterSuite(func() {
 	By("tearing down the test environment")
+	err := testEnv.Stop()
+	Expect(err).ToNot(HaveOccurred())
 })