align syncer with latest changes

Author: ApsTomar

pkg/controllers/resources/endpointSlices/syncer.go renamed to pkg/controllers/resources/endpointslices/syncer.go

@@ -1,4 +1,4 @@
-package endpoints
+package endpointslices
 
 import (
 	"errors"
@@ -23,7 +23,7 @@ import (
 )
 
 func New(ctx *synccontext.RegisterContext) (syncertypes.Object, error) {
-	mapper, err := ctx.Mappings.ByGVK(mappings.Endpoints())
+	mapper, err := ctx.Mappings.ByGVK(mappings.EndpointSlices())
 	if err != nil {
 		return nil, err
 	}
@@ -63,7 +63,7 @@ func (s *endpointSliceSyncer) SyncToHost(ctx *synccontext.SyncContext, event *sy
 	}
 
 	pObj := s.translate(ctx, event.Virtual)
-	err := pro.ApplyPatchesHostObject(ctx, nil, pObj, event.Virtual, ctx.Config.Sync.ToHost.EndpointSlices.Patches, false)
+	err := pro.ApplyPatchesHostObject(ctx, pObj, event.Virtual, ctx.Config.Sync.ToHost.EndpointSlices.Patches, false)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
@@ -129,7 +129,7 @@ func (s *endpointSliceSyncer) ReconcileStart(ctx *synccontext.SyncContext, req c
 	} else if svc.Spec.Selector != nil {
 		// check if it was a managed endpointSlice object before and delete it
 		endpointSlice := &discoveryv1.EndpointSlice{}
-		err = ctx.PhysicalClient.Get(ctx, s.VirtualToHost(ctx, req.NamespacedName, nil), endpointSlice)
+		err = ctx.HostClient.Get(ctx, s.VirtualToHost(ctx, req.NamespacedName, nil), endpointSlice)
 		if err != nil {
 			if !kerrors.IsNotFound(err) {
 				klog.Infof("Error retrieving endpointSliceList: %v", err)
@@ -146,7 +146,7 @@ func (s *endpointSliceSyncer) ReconcileStart(ctx *synccontext.SyncContext, req c
 			// to the same endpoints resulting in wrong DNS and cluster networking. Hence, deleting the previously
 			// managed endpointSlices signals the Kubernetes controller to recreate the endpointSlices from the selector.
 			klog.Infof("Refresh endpointSlice in physical cluster because they shouldn't be managed by vcluster anymore")
-			err = ctx.PhysicalClient.Delete(ctx, endpointSlice)
+			err = ctx.HostClient.Delete(ctx, endpointSlice)
 			if err != nil {
 				klog.Infof("Error deleting endpoints %s/%s: %v", endpointSlice.Namespace, endpointSlice.Name, err)
 				return true, err
@@ -158,10 +158,10 @@ func (s *endpointSliceSyncer) ReconcileStart(ctx *synccontext.SyncContext, req c
 
 	// check if it was a Kubernetes managed endpointSlice object before and delete it
 	endpointSlice := &discoveryv1.EndpointSlice{}
-	err = ctx.PhysicalClient.Get(ctx, s.VirtualToHost(ctx, req.NamespacedName, nil), endpointSlice)
+	err = ctx.HostClient.Get(ctx, s.VirtualToHost(ctx, req.NamespacedName, nil), endpointSlice)
 	if err == nil && (endpointSlice.Annotations == nil || endpointSlice.Annotations[translate.NameAnnotation] == "") {
 		klog.Infof("Refresh endpointSlice in physical cluster because they should be managed by vCluster now")
-		err = ctx.PhysicalClient.Delete(ctx, endpointSlice)
+		err = ctx.HostClient.Delete(ctx, endpointSlice)
 		if err != nil {
 			klog.Infof("Error deleting endpointSlice %s/%s: %v", endpointSlice.Namespace, endpointSlice.Name, err)
 			return true, err

pkg/controllers/resources/endpointSlices/translate.go renamed to pkg/controllers/resources/endpointslices/translate.go

@@ -1,4 +1,4 @@
-package endpoints
+package endpointslices
 
 import (
 	"github.com/loft-sh/vcluster/pkg/mappings"
@@ -10,7 +10,9 @@ import (
 )
 
 func (s *endpointSliceSyncer) translate(ctx *synccontext.SyncContext, vObj client.Object) *discoveryv1.EndpointSlice {
-	endpointSlice := translate.HostMetadata(vObj.(*discoveryv1.EndpointSlice), s.VirtualToHost(ctx, types.NamespacedName{Name: vObj.GetName(), Namespace: vObj.GetNamespace()}, vObj), s.excludedAnnotations...)
+	endpointSlice := translate.HostMetadata(vObj.(*discoveryv1.EndpointSlice),
+		s.VirtualToHost(ctx, types.NamespacedName{Name: vObj.GetName(), Namespace: vObj.GetNamespace()}, vObj),
+		s.excludedAnnotations...)
 	s.translateSpec(ctx, endpointSlice)
 	return endpointSlice
 }

pkg/controllers/resources/register.go

@@ -8,6 +8,7 @@ import (
 	"github.com/loft-sh/vcluster/pkg/controllers/resources/csinodes"
 	"github.com/loft-sh/vcluster/pkg/controllers/resources/csistoragecapacities"
 	"github.com/loft-sh/vcluster/pkg/controllers/resources/endpoints"
+	"github.com/loft-sh/vcluster/pkg/controllers/resources/endpointslices"
 	"github.com/loft-sh/vcluster/pkg/controllers/resources/events"
 	"github.com/loft-sh/vcluster/pkg/controllers/resources/ingressclasses"
 	"github.com/loft-sh/vcluster/pkg/controllers/resources/ingresses"
@@ -48,7 +49,7 @@ func getSyncers(ctx *synccontext.RegisterContext) []BuildController {
 		isEnabled(ctx.Config.Sync.FromHost.Secrets.Enabled, secrets.NewFromHost),
 		isEnabled(ctx.Config.Sync.ToHost.Secrets.Enabled, secrets.New),
 		isEnabled(ctx.Config.Sync.ToHost.Endpoints.Enabled, endpoints.New),
-		isEnabled(ctx.Config.Sync.ToHost.EndpointSlices.Enabled, endpoints.New),
+		isEnabled(ctx.Config.Sync.ToHost.EndpointSlices.Enabled, endpointslices.New),
 		isEnabled(ctx.Config.Sync.ToHost.Pods.Enabled, pods.New),
 		isEnabled(ctx.Config.Sync.FromHost.Events.Enabled, events.New),
 		isEnabled(ctx.Config.Sync.ToHost.PersistentVolumeClaims.Enabled, persistentvolumeclaims.New),

pkg/mappings/registry.go

@@ -9,6 +9,7 @@ import (
 	"github.com/loft-sh/vcluster/pkg/scheme"
 	"github.com/loft-sh/vcluster/pkg/syncer/synccontext"
 	corev1 "k8s.io/api/core/v1"
+	discoveryv1 "k8s.io/api/discovery/v1"
 	networkingv1 "k8s.io/api/networking/v1"
 	schedulingv1 "k8s.io/api/scheduling/v1"
 	storagev1 "k8s.io/api/storage/v1"
@@ -105,6 +106,10 @@ func Endpoints() schema.GroupVersionKind {
 	return corev1.SchemeGroupVersion.WithKind("Endpoints")
 }
 
+func EndpointSlices() schema.GroupVersionKind {
+	return discoveryv1.SchemeGroupVersion.WithKind("EndpointSlice")
+}
+
 func Services() schema.GroupVersionKind {
 	return corev1.SchemeGroupVersion.WithKind("Service")
 }

pkg/mappings/resources/endpointslices.go

@@ -0,0 +1,47 @@
+package resources
+
+import (
+	"github.com/loft-sh/vcluster/pkg/mappings/generic"
+	"github.com/loft-sh/vcluster/pkg/syncer/synccontext"
+	"github.com/loft-sh/vcluster/pkg/util/translate"
+	discoveryv1 "k8s.io/api/discovery/v1"
+	"k8s.io/apimachinery/pkg/types"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+func CreateEndpointSlicesMapper(ctx *synccontext.RegisterContext) (synccontext.Mapper, error) {
+	mapper, err := generic.NewMapper(ctx, &discoveryv1.EndpointSlice{}, translate.Default.HostName)
+	if err != nil {
+		return nil, err
+	}
+
+	return &endpointSlicesMapper{
+		Mapper: mapper,
+	}, nil
+}
+
+type endpointSlicesMapper struct {
+	synccontext.Mapper
+}
+
+func (s *endpointSlicesMapper) VirtualToHost(ctx *synccontext.SyncContext, req types.NamespacedName, vObj client.Object) types.NamespacedName {
+	if req.Name == "kubernetes" && req.Namespace == "default" {
+		return types.NamespacedName{
+			Name:      translate.VClusterName,
+			Namespace: ctx.CurrentNamespace,
+		}
+	}
+
+	return s.Mapper.VirtualToHost(ctx, req, vObj)
+}
+
+func (s *endpointSlicesMapper) HostToVirtual(ctx *synccontext.SyncContext, req types.NamespacedName, pObj client.Object) types.NamespacedName {
+	if req.Name == translate.VClusterName && req.Namespace == ctx.CurrentNamespace {
+		return types.NamespacedName{
+			Name:      "kubernetes",
+			Namespace: "default",
+		}
+	}
+
+	return s.Mapper.HostToVirtual(ctx, req, pObj)
+}

pkg/mappings/resources/register.go

@@ -17,6 +17,7 @@ func getMappers(ctx *synccontext.RegisterContext) []BuildMapper {
 		CreateSecretsMapper,
 		CreateConfigMapsMapper,
 		CreateEndpointsMapper,
+		CreateEndpointSlicesMapper,
 		CreateEventsMapper,
 		isEnabled(ctx.Config.Sync.ToHost.Ingresses.Enabled, CreateIngressesMapper),
 		CreateNamespacesMapper,