Fix manager start commands

operator-framework · Dec 16, 2020 · 05dec87 · 05dec87
1 parent a448cdf
commit 05dec87
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cmd/olm/main.go b/cmd/olm/main.go
@@ -231,7 +231,7 @@ func main() {
 	}
 
 	// Start the controller manager
-	if err := mgr.Start(ctx.Done()); err != nil {
+	if err := mgr.Start(ctx); err != nil {
 		logger.WithError(err).Fatal("controller manager stopped")
 	}
 

diff --git a/pkg/controller/operators/suite_test.go b/pkg/controller/operators/suite_test.go
@@ -144,16 +144,16 @@ var _ = BeforeSuite(func() {
 	Expect(operatorConditionReconciler.SetupWithManager(mgr)).ToNot(HaveOccurred())
 	Expect(operatorConditionGeneratorReconciler.SetupWithManager(mgr)).ToNot(HaveOccurred())
 
-	ctx = ctrl.SetupSignalHandler()
+	ctx := ctrl.SetupSignalHandler()
 	go func() {
 		defer GinkgoRecover()
 
 		By("Starting managed controllers")
-		err = mgr.Start(stop)
+		err := mgr.Start(ctx)
 		Expect(err).ToNot(HaveOccurred())
 	}()
 
-	Expect(mgr.GetCache().WaitForCacheSync(stop)).To(BeTrue(), "Cache sync failed on startup")
+	Expect(mgr.GetCache().WaitForCacheSync(ctx)).To(BeTrue(), "Cache sync failed on startup")
 
 	k8sClient = mgr.GetClient()
 	Expect(k8sClient).ToNot(BeNil())