drop CRTClient abstraction

cmd/main.go

@@ -84,10 +84,7 @@ func main() {
 		}
 	}
 
-	app, err := server.NewInClusterApplication(cl, configuration.Namespace())
-	if err != nil {
-		panic(err.Error())
-	}
+	app := server.NewInClusterApplication(cl, configuration.Namespace())
 	// Initialize toolchain cluster cache service
 	// let's cache the member clusters before we start the services,
 	// this will speed up the first request

pkg/application/service/context/service_context.go

@@ -2,14 +2,12 @@ package context
 
 import (
 	"github.com/codeready-toolchain/registration-service/pkg/application/service"
-	"github.com/codeready-toolchain/registration-service/pkg/kubeclient"
-	"sigs.k8s.io/controller-runtime/pkg/client"
+	"github.com/codeready-toolchain/registration-service/pkg/namespaced"
 )
 
 type ServiceContextProducer func() ServiceContext
 
 type ServiceContext interface {
-	CRTClient() kubeclient.CRTClient
-	Client() client.Client
+	Client() namespaced.Client
 	Services() service.Services
 }

pkg/application/service/factory/service_factory.go

@@ -7,42 +7,30 @@ import (
 	servicecontext "github.com/codeready-toolchain/registration-service/pkg/application/service/context"
 	"github.com/codeready-toolchain/registration-service/pkg/configuration"
 	informerservice "github.com/codeready-toolchain/registration-service/pkg/informers/service"
-	"github.com/codeready-toolchain/registration-service/pkg/kubeclient"
 	"github.com/codeready-toolchain/registration-service/pkg/log"
+	"github.com/codeready-toolchain/registration-service/pkg/namespaced"
 	clusterservice "github.com/codeready-toolchain/registration-service/pkg/proxy/service"
 	signupservice "github.com/codeready-toolchain/registration-service/pkg/signup/service"
 	verificationservice "github.com/codeready-toolchain/registration-service/pkg/verification/service"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 type serviceContextImpl struct {
-	kubeClient kubeclient.CRTClient
-	client     client.Client
-	services   service.Services
+	client   namespaced.Client
+	services service.Services
 }
 
 type ServiceContextOption = func(ctx *serviceContextImpl)
 
-func CRTClientOption(kubeClient kubeclient.CRTClient) ServiceContextOption {
-	return func(ctx *serviceContextImpl) {
-		ctx.kubeClient = kubeClient
-	}
-}
-
-func InformerOption(client client.Client) ServiceContextOption {
+func NamespacedClientOption(client namespaced.Client) ServiceContextOption {
 	return func(ctx *serviceContextImpl) {
 		ctx.client = client
 	}
 }
 
-func (s *serviceContextImpl) Client() client.Client {
+func (s *serviceContextImpl) Client() namespaced.Client {
 	return s.client
 }
 
-func (s *serviceContextImpl) CRTClient() kubeclient.CRTClient {
-	return s.kubeClient
-}
-
 func (s *serviceContextImpl) Services() service.Services {
 	return s.services
 }