refactor/cleanup controller logic

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
operator-framework · Apr 11, 2023 · 7abf80b · 7abf80b
1 parent bc7778c
commit 7abf80b
Show file tree

Hide file tree

Showing 4 changed files with 169 additions and 215 deletions.
diff --git a/main.go b/main.go
@@ -92,20 +92,6 @@ func main() {
 		setupLog.Error(err, "unable to create controller", "controller", "CatalogSource")
 		os.Exit(1)
 	}
-	if err = (&corecontrollers.BundleMetadataReconciler{
-		Client: mgr.GetClient(),
-		Scheme: mgr.GetScheme(),
-	}).SetupWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "BundleMetadata")
-		os.Exit(1)
-	}
-	if err = (&corecontrollers.PackageReconciler{
-		Client: mgr.GetClient(),
-		Scheme: mgr.GetScheme(),
-	}).SetupWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "Package")
-		os.Exit(1)
-	}
 	//+kubebuilder:scaffold:builder
 
 	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {

diff --git a/pkg/controllers/core/bundlemetadata_controller.go b/pkg/controllers/core/bundlemetadata_controller.go