WIP: drop routeclient from reconciler

Change the code to use the runtime client so we can drop some vendor
dependencies.

Author: darkdoc

go.mod

@@ -13,7 +13,6 @@ require (
 	github.com/onsi/ginkgo/v2 v2.25.2
 	github.com/onsi/gomega v1.38.2
 	github.com/openshift/api v3.9.1-0.20190916204813-cdbe64fb0c91+incompatible
-	github.com/openshift/client-go v0.0.0-20240115204758-e6bf7d631d5e // release-4.16
 	github.com/operator-framework/api v0.33.0
 	github.com/segmentio/analytics-go/v3 v3.3.0
 	go.uber.org/mock v0.6.0
@@ -194,7 +193,6 @@ replace (
 	// Usually not needed unless we have newer k8s.io deps and argocd still uses an old gitops-engine
 	// github.com/argoproj/gitops-engine => github.com/argoproj/gitops-engine v0.0.0-20240905010810-bd7681ae3f8b
 	github.com/openshift/api => github.com/openshift/api v0.0.0-20240124164020-e2ce40831f2e
-	github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20240115204758-e6bf7d631d5e
 	// Caused by Argo importing 'k8s.io/api'
 	// Override all the v0.0.0 entries
 	k8s.io/api => k8s.io/api v0.33.4

go.sum

@@ -6,8 +6,8 @@ dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
 dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA=
 github.com/42wim/httpsig v1.2.3 h1:xb0YyWhkYj57SPtfSttIobJUPJZB9as1nsfo7KWVcEs=
 github.com/42wim/httpsig v1.2.3/go.mod h1:nZq9OlYKDrUBhptd77IHx4/sZZD+IxTBADvAPI9G/EM=
-github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 h1:He8afgbRMd7mFxO99hRNu+6tazq8nFF9lIwo9JFroBk=
-github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
+github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU=
+github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 h1:Gt0j3wceWMwPmiazCa8MzMA0MfhmPIz0Qp0FJ6qcM0U=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0/go.mod h1:Ot/6aikWnKWi4l9QB7qVSwa8iMphQNqkWALMoNT3rzM=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.0 h1:j8BorDEigD8UFOSZQiSqAMOOleyQOOQPnUAwV+Ls1gA=
@@ -325,12 +325,8 @@ github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJw
 github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
 github.com/openshift/api v0.0.0-20240124164020-e2ce40831f2e h1:cxgCNo/R769CO23AK5TCh45H9SMUGZ8RukiF2/Qif3o=
 github.com/openshift/api v0.0.0-20240124164020-e2ce40831f2e/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
-github.com/openshift/client-go v0.0.0-20240115204758-e6bf7d631d5e h1:qGjfKX8i0h4efMNEnhgTdxcdx6gwwOwhTfBJ20WFqA8=
-github.com/openshift/client-go v0.0.0-20240115204758-e6bf7d631d5e/go.mod h1:2am3qrggh9LlDCf/MDGzcFWMhdaushxFQi0+ZZDhdVk=
 github.com/operator-framework/api v0.33.0 h1:Tdu9doXz6Key2riIiP3/JPahHEgFBXAqyWQN4kOITS8=
 github.com/operator-framework/api v0.33.0/go.mod h1:sEh1VqwQCJUj+l/rKNWPDEJdFNAbdTu8QcM+x+wdYYo=
-github.com/operator-framework/operator-lifecycle-manager v0.33.0 h1:KFBrln/E0itngxLNgP5CGQQoTf9whtudrLnZsxS2Ey4=
-github.com/operator-framework/operator-lifecycle-manager v0.33.0/go.mod h1:FsL9ACmFMFfDIA/Y20ECuiT49d6gVFfcdebReqtIWyM=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
@@ -559,8 +555,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw=
 gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
-google.golang.org/genproto v0.0.0-20250603155806-513f23925822 h1:rHWScKit0gvAPuOnu87KpaYtjK5zBMLcULh7gxkCXu4=
-google.golang.org/genproto v0.0.0-20250603155806-513f23925822/go.mod h1:HubltRL7rMh0LfnQPkMH4NPDFEWp0jw3vixw7jEM53s=
+google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y=
+google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s=
 google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 h1:FiusG7LWj+4byqhbvmB+Q93B/mOxJLN2DTozDuZm4EU=
 google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7/go.mod h1:kXqgZtrWaf6qS3jZOCnCH7WYfrvFjkC51bM8fz3RsCA=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1 h1:pmJpJEvT846VzausCQ5d7KreSROcDqmO388w5YbnltA=

internal/controller/kube.go

@@ -20,10 +20,10 @@ import (
 	"context"
 	"fmt"
 
-	routeclient "github.com/openshift/client-go/route/clientset/versioned"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	routev1 "github.com/openshift/api/route/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	kubeclient "sigs.k8s.io/controller-runtime/pkg/client"
@@ -84,8 +84,10 @@ func referSameObject(a, b *metav1.OwnerReference) bool {
 	return aGV.Version == bGV.Version && aGV.Group == bGV.Group && a.Kind == b.Kind && a.Name == b.Name && a.UID == b.UID
 }
 
-func getRoute(routeClient routeclient.Interface, routeName, namespace string) (string, error) {
-	route, err := routeClient.RouteV1().Routes(namespace).Get(context.Background(), routeName, metav1.GetOptions{})
+func getRoute(cl kubeclient.Client, routeName, namespace string) (string, error) {
+	route := routev1.Route{}
+
+	err := cl.Get(context.Background(), types.NamespacedName{Name: routeName, Namespace: namespace}, &route)
 	if err != nil {
 		return "", err
 	}

internal/controller/kube_test.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	routev1 "github.com/openshift/api/route/v1"
-	routefake "github.com/openshift/client-go/route/clientset/versioned/fake"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -498,20 +497,19 @@ var _ = Describe("ObjectYaml", func() {
 
 var _ = Describe("GetRoute", func() {
 	var (
-		routeClient *routefake.Clientset
-		namespace   string
-		routeName   string
+		fakeClient client.Client
+		namespace  string
+		routeName  string
 	)
 
 	BeforeEach(func() {
-		routeClient = routefake.NewSimpleClientset()
 		namespace = "default"
 		routeName = "test-route"
 	})
 
 	Context("when the route exists", func() {
-		BeforeEach(func() {
-			route := &routev1.Route{
+		It("should return the URL of the route", func() {
+			route := routev1.Route{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      routeName,
 					Namespace: namespace,
@@ -524,40 +522,41 @@ var _ = Describe("GetRoute", func() {
 					},
 				},
 			}
-			_, err := routeClient.RouteV1().Routes(namespace).Create(context.Background(), route, metav1.CreateOptions{})
-			Expect(err).ToNot(HaveOccurred())
-		})
 
-		It("should return the URL of the route", func() {
-			url, err := getRoute(routeClient, routeName, namespace)
+			fakeClient = fake.NewClientBuilder().WithScheme(testEnv.Scheme).
+				WithRuntimeObjects(&route).Build()
+
+			url, err := getRoute(fakeClient, routeName, namespace)
 			Expect(err).ToNot(HaveOccurred())
 			Expect(url).To(Equal("https://example.com"))
 		})
 	})
 
 	Context("when the route does not exist", func() {
 		It("should return an error", func() {
-			url, err := getRoute(routeClient, routeName, namespace)
+			fakeClient = fake.NewClientBuilder().WithScheme(testEnv.Scheme).
+				WithRuntimeObjects().Build()
+
+			url, err := getRoute(fakeClient, routeName, namespace)
 			Expect(err).To(HaveOccurred())
 			Expect(url).To(BeEmpty())
 		})
 	})
 
 	Context("when the route has no ingress", func() {
-		BeforeEach(func() {
-			route := &routev1.Route{
+		It("should return an error", func() {
+			route := routev1.Route{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      routeName,
 					Namespace: namespace,
 				},
 				Status: routev1.RouteStatus{},
 			}
-			_, err := routeClient.RouteV1().Routes(namespace).Create(context.Background(), route, metav1.CreateOptions{})
-			Expect(err).ToNot(HaveOccurred())
-		})
 
-		It("should return an error", func() {
-			url, err := getRoute(routeClient, routeName, namespace)
+			fakeClient = fake.NewClientBuilder().WithScheme(testEnv.Scheme).
+				WithRuntimeObjects(&route).Build()
+
+			url, err := getRoute(fakeClient, routeName, namespace)
 			Expect(err).To(HaveOccurred())
 			Expect(url).To(BeEmpty())
 		})

internal/controller/pattern_controller.go

@@ -41,7 +41,6 @@ import (
 
 	argoapi "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
 	v1 "github.com/openshift/api/config/v1"
-	routeclient "github.com/openshift/client-go/route/clientset/versioned"
 	corev1 "k8s.io/api/core/v1"
 
 	api "github.com/hybrid-cloud-patterns/patterns-operator/api/v1alpha1"
@@ -58,7 +57,6 @@ type PatternReconciler struct {
 	logger logr.Logger
 
 	config          *rest.Config
-	routeClient     routeclient.Interface
 	driftWatcher    driftWatcher
 	gitOperations   GitOperations
 	giteaOperations GiteaOperations
@@ -356,7 +354,7 @@ func (r *PatternReconciler) createGiteaInstance(input *api.Pattern) error {
 
 	// Here we need to call the gitea migration bits
 	// Let's get the GiteaServer route
-	giteaRouteURL, routeErr := getRoute(r.routeClient, GiteaRouteName, GiteaNamespace)
+	giteaRouteURL, routeErr := getRoute(r.Client, GiteaRouteName, GiteaNamespace)
 	if routeErr != nil {
 		return fmt.Errorf("GiteaServer route not ready: %v", routeErr)
 	}
@@ -589,12 +587,8 @@ func (r *PatternReconciler) finalizeObject(instance *api.Pattern) error {
 
 // SetupWithManager sets up the controller with the Manager.
 func (r *PatternReconciler) SetupWithManager(mgr ctrl.Manager) error {
-	var err error
 	r.config = mgr.GetConfig()
 
-	if r.routeClient, err = routeclient.NewForConfig(r.config); err != nil {
-		return err
-	}
 	r.driftWatcher, _ = newDriftWatcher(r.Client, mgr.GetLogger(), newGitClient())
 	r.gitOperations = &GitOperationsImpl{}
 	r.giteaOperations = &GiteaOperationsImpl{}

internal/controller/suite_test.go

@@ -28,6 +28,7 @@ import (
 	. "github.com/onsi/gomega"
 	apiv1 "github.com/openshift/api/config/v1"
 	operatorv1 "github.com/openshift/api/operator/v1"
+	routev1 "github.com/openshift/api/route/v1"
 	operatorv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
 
 	"k8s.io/client-go/kubernetes/scheme"
@@ -85,6 +86,8 @@ var _ = BeforeSuite(func() {
 	Expect(err).NotTo(HaveOccurred())
 	err = operatorv1alpha1.AddToScheme(scheme.Scheme)
 	Expect(err).NotTo(HaveOccurred())
+	err = routev1.AddToScheme(scheme.Scheme)
+	Expect(err).NotTo(HaveOccurred())
 	//+kubebuilder:scaffold:scheme
 
 	k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})