remove the SearchDomain API

liqotech · Jun 10, 2022 · 514dd69 · 514dd69
1 parent ddacebb
commit 514dd69
Show file tree

Hide file tree

Showing 19 changed files with 11 additions and 648 deletions.
diff --git a/apis/discovery/v1alpha1/foreigncluster_types.go b/apis/discovery/v1alpha1/foreigncluster_types.go
@@ -58,7 +58,6 @@ const (
 	// manual -> No
 	// incomingPeering -> No
 	// LAN -> Yes
-	// WAN -> looks at the SearchDomain Spec.
 	PeeringEnabledAuto PeeringEnabledType = "Auto"
 	// PeeringEnabledNo indicates to disable the peering with this remote cluster.
 	PeeringEnabledNo PeeringEnabledType = "No"
@@ -110,7 +109,7 @@ type ForeignClusterSpec struct {
 	// +kubebuilder:default=true
 	// +kubebuilder:validation:Optional
 	InsecureSkipTLSVerify *bool `json:"insecureSkipTLSVerify"`
-	// If discoveryType is LAN or WAN and this indicates the number of seconds after that
+	// If discoveryType is LAN, this indicates the number of seconds after that
 	// this ForeignCluster will be removed if no updates have been received.
 	// +kubebuilder:validation:Minimum=0
 	TTL int `json:"ttl,omitempty"`

diff --git a/apis/discovery/v1alpha1/groupversion_info.go b/apis/discovery/v1alpha1/groupversion_info.go
@@ -49,7 +49,4 @@ var (
 
 	// ResourceRequestGroupResource is the group resource used to register ResourceRequest CRD.
 	ResourceRequestGroupResource = schema.GroupResource{Group: GroupVersion.Group, Resource: ResourceRequestResource}
-
-	// SearchDomainGroupResource is the group resource used to register SearchDomain CRD.
-	SearchDomainGroupResource = schema.GroupResource{Group: GroupVersion.Group, Resource: "searchdomains"}
 )
diff --git a/apis/discovery/v1alpha1/searchdomain_types.go b/apis/discovery/v1alpha1/searchdomain_types.go
diff --git a/apis/discovery/v1alpha1/zz_generated.deepcopy.go b/apis/discovery/v1alpha1/zz_generated.deepcopy.go
diff --git a/cmd/liqo-controller-manager/main.go b/cmd/liqo-controller-manager/main.go
@@ -50,7 +50,6 @@ import (
 	resourceRequestOperator "github.com/liqotech/liqo/pkg/liqo-controller-manager/resource-request-controller"
 	resourcemonitors "github.com/liqotech/liqo/pkg/liqo-controller-manager/resource-request-controller/resource-monitors"
 	resourceoffercontroller "github.com/liqotech/liqo/pkg/liqo-controller-manager/resourceoffer-controller"
-	searchdomainoperator "github.com/liqotech/liqo/pkg/liqo-controller-manager/search-domain-operator"
 	shadowpodctrl "github.com/liqotech/liqo/pkg/liqo-controller-manager/shadowpod-controller"
 	liqostorageprovisioner "github.com/liqotech/liqo/pkg/liqo-controller-manager/storageprovisioner"
 	virtualNodectrl "github.com/liqotech/liqo/pkg/liqo-controller-manager/virtualNode-controller"
@@ -225,17 +224,6 @@ func main() {
 	insecureTransport := &http.Transport{IdleConnTimeout: 1 * time.Minute, TLSClientConfig: &tls.Config{InsecureSkipVerify: true}}
 
 	// Setup operators
-	searchDomainReconciler := &searchdomainoperator.SearchDomainReconciler{
-		Client:            mgr.GetClient(),
-		Scheme:            mgr.GetScheme(),
-		ResyncPeriod:      *resyncPeriod,
-		LocalCluster:      clusterIdentity,
-		InsecureTransport: insecureTransport,
-	}
-	if err = searchDomainReconciler.SetupWithManager(mgr); err != nil {
-		klog.Fatal(err)
-	}
-
 	foreignClusterReconciler := &foreignclusteroperator.ForeignClusterReconciler{
 		Client:        mgr.GetClient(),
 		Scheme:        mgr.GetScheme(),

diff --git a/deployments/liqo/crds/discovery.liqo.io_foreignclusters.yaml b/deployments/liqo/crds/discovery.liqo.io_foreignclusters.yaml
@@ -115,9 +115,9 @@ spec:
                 - "Yes"
                 type: string
               ttl:
-                description: If discoveryType is LAN or WAN and this indicates the
-                  number of seconds after that this ForeignCluster will be removed
-                  if no updates have been received.
+                description: If discoveryType is LAN, this indicates the number of
+                  seconds after that this ForeignCluster will be removed if no updates
+                  have been received.
                 minimum: 0
                 type: integer
             required:

diff --git a/deployments/liqo/crds/discovery.liqo.io_searchdomains.yaml b/deployments/liqo/crds/discovery.liqo.io_searchdomains.yaml
diff --git a/deployments/liqo/files/liqo-controller-manager-ClusterRole.yaml b/deployments/liqo/files/liqo-controller-manager-ClusterRole.yaml
@@ -228,26 +228,6 @@ rules:
   - deletecollection
   - list
   - watch
-- apiGroups:
-  - discovery.liqo.io
-  resources:
-  - searchdomains
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - discovery.liqo.io
-  resources:
-  - searchdomains/finalizers
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - metrics.liqo.io
   resources:

diff --git a/pkg/discovery/const.go b/pkg/discovery/const.go
@@ -30,8 +30,6 @@ const (
 	AuthTokenLabel = "discovery.liqo.io/auth-token"
 	// DiscoveryTypeLabel used to mark the discovery type.
 	DiscoveryTypeLabel = "discovery.liqo.io/discovery-type"
-	// SearchDomainLabel used to mark the search domain linked to the foreign cluster.
-	SearchDomainLabel = "discovery.liqo.io/searchdomain"
 )
 
 // Type indicates how a ForeignCluster has been discovered.
@@ -40,8 +38,6 @@ type Type string
 const (
 	// LanDiscovery value.
 	LanDiscovery Type = "LAN"
-	// WanDiscovery value.
-	WanDiscovery Type = "WAN"
 	// ManualDiscovery value.
 	ManualDiscovery Type = "Manual"
 	// IncomingPeeringDiscovery value.