remove unused extension reconciler fields (#640)

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
operator-framework · Feb 21, 2024 · 31dd492 · 31dd492
1 parent cfc0a15
commit 31dd492
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 23 deletions.
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -125,10 +125,7 @@ func main() {
 	}
 
 	if err = (&controllers.ExtensionReconciler{
-		Client:         cl,
-		BundleProvider: catalogClient,
-		Scheme:         mgr.GetScheme(),
-		Resolver:       resolver,
+		Client: cl,
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "Extension")
 		os.Exit(1)

diff --git a/internal/controllers/extension_controller.go b/internal/controllers/extension_controller.go
@@ -19,17 +19,14 @@ package controllers
 import (
 	"context"
 
+	catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1"
 	"k8s.io/apimachinery/pkg/api/equality"
-	"k8s.io/apimachinery/pkg/runtime"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1"
-	"github.com/operator-framework/deppy/pkg/deppy/solver"
-
 	ocv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1"
 	"github.com/operator-framework/operator-controller/internal/controllers/validators"
 	"github.com/operator-framework/operator-controller/pkg/features"
@@ -38,9 +35,6 @@ import (
 // ExtensionReconciler reconciles a Extension object
 type ExtensionReconciler struct {
 	client.Client
-	BundleProvider BundleProvider
-	Scheme         *runtime.Scheme
-	Resolver       *solver.Solver
 }
 
 //+kubebuilder:rbac:groups=olm.operatorframework.io,resources=extensions,verbs=get;list;watch;create;update;patch;delete

diff --git a/internal/controllers/suite_test.go b/internal/controllers/suite_test.go
@@ -22,17 +22,16 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/operator-framework/deppy/pkg/deppy/solver"
+	rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2"
+	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 
-	"github.com/operator-framework/deppy/pkg/deppy/solver"
-	rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2"
-	"github.com/stretchr/testify/require"
-
 	ocv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1"
 	"github.com/operator-framework/operator-controller/internal/controllers"
 	testutil "github.com/operator-framework/operator-controller/test/util"
@@ -61,16 +60,9 @@ func newClientAndReconciler(t *testing.T) (client.Client, *controllers.ClusterEx
 }
 
 func newClientAndExtensionReconciler(t *testing.T) (client.Client, *controllers.ExtensionReconciler) {
-	resolver, err := solver.New()
-	require.NoError(t, err)
-
 	cl := newClient(t)
-	fakeCatalogClient := testutil.NewFakeCatalogClient(testBundleList)
 	reconciler := &controllers.ExtensionReconciler{
-		Client:         cl,
-		BundleProvider: &fakeCatalogClient,
-		Scheme:         sch,
-		Resolver:       resolver,
+		Client: cl,
 	}
 	return cl, reconciler
 }