refactor: remove pro get client (#3128)

Author: FabianKramm

.github/workflows/e2e.yaml

@@ -273,10 +273,6 @@ jobs:
             test-suite-path: "./test/e2e"
         exclude:
           - ha: "true"
-          - distribution: "k3s"
-            test-suite-path: "./test/e2e_generic"
-          - distribution: "k8s"
-            test-suite-path: "./test/e2e_generic"
           - distribution: "k3s"
             test-suite-path: "./test/e2e_certs"
 

pkg/pro/controllers.go

@@ -5,6 +5,10 @@ import (
 	syncertypes "github.com/loft-sh/vcluster/pkg/syncer/types"
 )
 
+var InitProControllerContext = func(_ *synccontext.ControllerContext) error {
+	return nil
+}
+
 var RegisterProControllers = func(*synccontext.ControllerContext) error {
 	return nil
 }

pkg/pro/generic.go

@@ -19,6 +19,7 @@ import (
 	"github.com/loft-sh/vcluster/pkg/syncer/synccontext"
 	"github.com/loft-sh/vcluster/pkg/telemetry"
 	"github.com/loft-sh/vcluster/pkg/util/blockingcacheclient"
+	"github.com/loft-sh/vcluster/pkg/util/pluginhookclient"
 	"github.com/pkg/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -77,7 +78,7 @@ func NewControllerContext(ctx context.Context, options *config.VirtualClusterCon
 			Metrics:        metricsserver.Options{BindAddress: localManagerMetrics},
 			LeaderElection: false,
 			Cache:          getLocalCacheOptions(options),
-			NewClient:      pro.NewPhysicalClient(options),
+			NewClient:      pluginhookclient.NewPhysicalPluginClientFactory(blockingcacheclient.NewCacheClient),
 		})
 		if err != nil {
 			return nil, err
@@ -89,7 +90,7 @@ func NewControllerContext(ctx context.Context, options *config.VirtualClusterCon
 		Scheme:         scheme.Scheme,
 		Metrics:        metricsserver.Options{BindAddress: virtualManagerMetrics},
 		LeaderElection: false,
-		NewClient:      pro.NewVirtualClient(options),
+		NewClient:      pluginhookclient.NewVirtualPluginClientFactory(blockingcacheclient.NewCacheClient),
 	})
 	if err != nil {
 		return nil, err

pkg/setup/controller_context.go

@@ -13,6 +13,8 @@ import (
 	"github.com/loft-sh/vcluster/pkg/syncer/synccontext"
 	"github.com/loft-sh/vcluster/pkg/syncer/translator"
 	syncertypes "github.com/loft-sh/vcluster/pkg/syncer/types"
+	"github.com/loft-sh/vcluster/pkg/util/blockingcacheclient"
+	"github.com/loft-sh/vcluster/pkg/util/pluginhookclient"
 	"github.com/loft-sh/vcluster/pkg/util/translate"
 	corev1 "k8s.io/api/core/v1"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
@@ -193,7 +195,7 @@ func GetOptionsForMultiNamespaceManager(ctx *synccontext.RegisterContext, option
 		},
 		PprofBindAddress: "0",
 		LeaderElection:   false,
-		NewClient:        pro.NewVirtualClient(ctx.Config),
+		NewClient:        pluginhookclient.NewVirtualPluginClientFactory(blockingcacheclient.NewCacheClient),
 		WebhookServer:    nil,
 		Cache: cache.Options{
 			Mapper:                   ctx.HostManager.GetRESTMapper(),