Remove Lighthouse-specific ServiceImport/Export

Signed-off-by: Stephen Kitt <[email protected]>

pkg/agent/controller/agent.go

@@ -137,12 +137,6 @@ func New(spec *AgentSpecification, syncerConf broker.SyncerConfig, kubeClientSet
 		return nil, err
 	}
 
-	agentController.lhServiceExportController, err = newLHServiceExportController(syncerConf.LocalClient, syncerConf.RestMapper,
-		syncerConf.Scheme)
-	if err != nil {
-		return nil, err
-	}
-
 	return agentController, nil
 }
 
@@ -172,10 +166,6 @@ func (a *Controller) Start(stopCh <-chan struct{}) error {
 		return err
 	}
 
-	if err := a.lhServiceExportController.start(stopCh); err != nil {
-		return err
-	}
-
 	klog.Info("Agent controller started")
 
 	return nil

pkg/agent/controller/agent_test.go

@@ -29,7 +29,6 @@ import (
 	"github.com/submariner-io/admiral/pkg/syncer/broker"
 	"github.com/submariner-io/admiral/pkg/syncer/test"
 	"github.com/submariner-io/lighthouse/pkg/agent/controller"
-	lighthousev2a1 "github.com/submariner-io/lighthouse/pkg/apis/lighthouse.submariner.io/v2alpha1"
 	lhconstants "github.com/submariner-io/lighthouse/pkg/constants"
 	corev1 "k8s.io/api/core/v1"
 	discovery "k8s.io/api/discovery/v1beta1"
@@ -371,7 +370,6 @@ func newTestDiver() *testDriver {
 	Expect(corev1.AddToScheme(syncerScheme)).To(Succeed())
 	Expect(discovery.AddToScheme(syncerScheme)).To(Succeed())
 	Expect(mcsv1a1.AddToScheme(syncerScheme)).To(Succeed())
-	Expect(lighthousev2a1.AddToScheme(syncerScheme)).To(Succeed())
 
 	t := &testDriver{
 		cluster1: cluster{
@@ -401,7 +399,7 @@ func newTestDiver() *testDriver {
 		syncerConfig: &broker.SyncerConfig{
 			BrokerNamespace: test.RemoteNamespace,
 			RestMapper: test.GetRESTMapperFor(&mcsv1a1.ServiceExport{}, &mcsv1a1.ServiceImport{},
-				&corev1.Service{}, &corev1.Endpoints{}, &discovery.EndpointSlice{}, &lighthousev2a1.ServiceExport{}),
+				&corev1.Service{}, &corev1.Endpoints{}, &discovery.EndpointSlice{}),
 			BrokerClient: fake.NewDynamicClient(syncerScheme),
 			Scheme:       syncerScheme,
 		},
@@ -592,7 +590,7 @@ func awaitEndpointSlice(endpointSliceClient, serviceImportClient dynamic.Resourc
 		controllerFlag := false
 
 		Expect(endpointSlice.OwnerReferences[0]).To(Equal(metav1.OwnerReference{
-			APIVersion: "lighthouse.submariner.io.v2alpha1",
+			APIVersion: "multicluster.x-k8s.io.v1alpha1",
 			Kind:       "ServiceImport",
 			Name:       siName,
 			UID:        si.GetUID(),

pkg/agent/controller/controller_suite_test.go

@@ -20,7 +20,6 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	lighthousev2a1 "github.com/submariner-io/lighthouse/pkg/apis/lighthouse.submariner.io/v2alpha1"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/klog"
 	mcsv1a1 "sigs.k8s.io/mcs-api/pkg/apis/v1alpha1"
@@ -33,11 +32,6 @@ func init() {
 	if err != nil {
 		panic(err)
 	}
-
-	err = lighthousev2a1.AddToScheme(scheme.Scheme)
-	if err != nil {
-		panic(err)
-	}
 }
 
 func TestController(t *testing.T) {

pkg/agent/controller/endpoint.go

@@ -102,7 +102,7 @@ func (e *EndpointController) endpointSliceFromEndpoints(endpoints *corev1.Endpoi
 		lhconstants.LabelSourceName:        e.serviceName,
 	}
 	endpointSlice.OwnerReferences = []metav1.OwnerReference{{
-		APIVersion:         "lighthouse.submariner.io.v2alpha1",
+		APIVersion:         "multicluster.x-k8s.io.v1alpha1",
 		Kind:               "ServiceImport",
 		Name:               e.serviceImportName,
 		UID:                e.serviceImportUID,

pkg/agent/controller/types.go

@@ -29,17 +29,16 @@ import (
 )
 
 type Controller struct {
-	clusterID                 string
-	globalnetEnabled          bool
-	namespace                 string
-	kubeClientSet             kubernetes.Interface
-	serviceExportClient       dynamic.NamespaceableResourceInterface
-	serviceExportSyncer       syncer.Interface
-	serviceImportSyncer       *broker.Syncer
-	endpointSliceSyncer       *broker.Syncer
-	serviceSyncer             syncer.Interface
-	serviceImportController   *ServiceImportController
-	lhServiceExportController *LHServiceExportController
+	clusterID               string
+	globalnetEnabled        bool
+	namespace               string
+	kubeClientSet           kubernetes.Interface
+	serviceExportClient     dynamic.NamespaceableResourceInterface
+	serviceExportSyncer     syncer.Interface
+	serviceImportSyncer     *broker.Syncer
+	endpointSliceSyncer     *broker.Syncer
+	serviceSyncer           syncer.Interface
+	serviceImportController *ServiceImportController
 }
 
 type AgentSpecification struct {
@@ -72,8 +71,3 @@ type EndpointController struct {
 	serviceImportSourceNameSpace string
 	stopCh                       chan struct{}
 }
-
-type LHServiceExportController struct {
-	lhServiceExportSyncer syncer.Interface
-	localClient           dynamic.Interface
-}

pkg/agent/main.go

@@ -26,7 +26,6 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/scheme"
 
-	lighthousev2a1 "github.com/submariner-io/lighthouse/pkg/apis/lighthouse.submariner.io/v2alpha1"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/klog"
 	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
@@ -57,11 +56,6 @@ func main() {
 		klog.Exitf("Error adding Multicluster v1alpha1 to the scheme: %v", err)
 	}
 
-	err = lighthousev2a1.AddToScheme(scheme.Scheme)
-	if err != nil {
-		klog.Exitf("Error adding lighthouse V2alpha1 to the scheme: %v", err)
-	}
-
 	cfg, err := clientcmd.BuildConfigFromFlags(masterURL, kubeConfig)
 	if err != nil {
 		klog.Fatalf("Error building kubeconfig: %s", err.Error())