Fix the local k8s instance shutdown

issue: kubernetes-sigs/controller-runtime#1571
Signed-off-by: Sebastian Sch <sebassch@gmail.com>

controllers/suite_test.go

@@ -47,8 +47,13 @@ import (
 // These tests use Ginkgo (BDD-style Go testing framework). Refer to
 // http://onsi.github.io/ginkgo/ to learn more about Ginkgo.
 
-var k8sClient client.Client
-var testEnv *envtest.Environment
+var (
+ k8sClient client.Client
+ testEnv *envtest.Environment
+
+ ctx context.Context
+ cancel context.CancelFunc
+)
 
 // Define utility constants for object names and testing timeouts/durations and intervals.
 const (
@@ -130,9 +135,11 @@ var _ = BeforeSuite(func(done Done) {
  os.Setenv("RELEASE_VERSION", "4.7.0")
  os.Setenv("OPERATOR_NAME", "sriov-network-operator")
 
+ ctx, cancel = context.WithCancel(ctrl.SetupSignalHandler())
+
  go func() {
  defer GinkgoRecover()
- err = k8sManager.Start(ctrl.SetupSignalHandler())
+ err = k8sManager.Start(ctx)
  Expect(err).ToNot(HaveOccurred())
  }()
 
@@ -168,8 +175,10 @@ var _ = BeforeSuite(func(done Done) {
 
 var _ = AfterSuite(func() {
  By("tearing down the test environment")
- err := testEnv.Stop()
- Expect(err).NotTo(HaveOccurred())
+ cancel()
+ Eventually(func() error {
+ return testEnv.Stop()
+ }, timeout, time.Second).ShouldNot(HaveOccurred())
 })
 
 func TestAPIs(t *testing.T) {