WIP: drop operatorclient from reconciler

This client is not used anywhere so it can be removed.

Author: darkdoc

cmd/main.go

@@ -46,6 +46,8 @@ import (
 	controllers "github.com/hybrid-cloud-patterns/patterns-operator/internal/controller"
 	"github.com/hybrid-cloud-patterns/patterns-operator/version"
 	apiv1 "github.com/openshift/api/config/v1"
+	operatorv1 "github.com/openshift/api/operator/v1"
+	operatorv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
@@ -62,7 +64,9 @@ func init() {
 
 	utilruntime.Must(gitopsv1alpha1.AddToScheme(scheme))
 	utilruntime.Must(apiv1.Install(scheme))
+	utilruntime.Must(operatorv1.Install(scheme))
 	utilruntime.Must(argoapi.AddToScheme(scheme))
+	utilruntime.Must(operatorv1alpha1.AddToScheme(scheme))
 	//+kubebuilder:scaffold:scheme
 }
 

internal/controller/pattern_controller.go

@@ -45,7 +45,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 
 	api "github.com/hybrid-cloud-patterns/patterns-operator/api/v1alpha1"
-	operatorclient "github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1"
 )
 
 const ReconcileLoopRequeueTime = 180 * time.Second
@@ -60,7 +59,6 @@ type PatternReconciler struct {
 
 	config          *rest.Config
 	routeClient     routeclient.Interface
-	operatorClient  operatorclient.OperatorV1Interface
 	driftWatcher    driftWatcher
 	gitOperations   GitOperations
 	giteaOperations GiteaOperations
@@ -594,10 +592,6 @@ func (r *PatternReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	var err error
 	r.config = mgr.GetConfig()
 
-	if r.operatorClient, err = operatorclient.NewForConfig(r.config); err != nil {
-		return err
-	}
-
 	if r.routeClient, err = routeclient.NewForConfig(r.config); err != nil {
 		return err
 	}

internal/controller/pattern_controller_test.go

@@ -27,8 +27,6 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	v1 "github.com/openshift/api/config/v1"
-	operatorv1 "github.com/openshift/api/operator/v1"
-	operatorclient "github.com/openshift/client-go/operator/clientset/versioned/fake"
 	gomock "go.uber.org/mock/gomock"
 
 	corev1 "k8s.io/api/core/v1"
@@ -216,10 +214,6 @@ func newFakeReconciler(initObjects ...runtime.Object) *PatternReconciler {
 		},
 	}
 	clusterInfra := &v1.Infrastructure{ObjectMeta: metav1.ObjectMeta{Name: "cluster"}, Spec: v1.InfrastructureSpec{PlatformSpec: v1.PlatformSpec{Type: "AWS"}}}
-	osControlManager := &operatorv1.OpenShiftControllerManager{
-		ObjectMeta: metav1.ObjectMeta{Name: "cluster"},
-		Spec:       operatorv1.OpenShiftControllerManagerSpec{},
-		Status:     operatorv1.OpenShiftControllerManagerStatus{OperatorStatus: operatorv1.OperatorStatus{Version: "4.10.3"}}}
 	ingress := &v1.Ingress{ObjectMeta: metav1.ObjectMeta{Name: "cluster"}, Spec: v1.IngressSpec{Domain: "hello.world"}}
 	fakeClient := fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(initObjects...).
 		WithRuntimeObjects(clusterVersion, clusterInfra, ingress).Build()
@@ -228,7 +222,6 @@ func newFakeReconciler(initObjects ...runtime.Object) *PatternReconciler {
 		Scheme:          scheme.Scheme,
 		Client:          fakeClient,
 		driftWatcher:    watcher,
-		operatorClient:  operatorclient.NewSimpleClientset(osControlManager).OperatorV1(),
 		AnalyticsClient: AnalyticsInit(true, logr.New(log.NullLogSink{})),
 		gitOperations:   mockGitOps,
 	}