refactor: change internal fabric name

Author: cheina97

pkg/gateway/fabric/geneve/internalfabric.go

@@ -0,0 +1,38 @@
+package geneve
+
+import (
+	"context"
+	"fmt"
+
+	networkingv1beta1 "github.com/liqotech/liqo/apis/networking/v1beta1"
+	"k8s.io/apimachinery/pkg/api/errors"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+// getInternalFabric retrieves the InternalFabric resource associated with the given GatewayServer.
+// WARNING: this function contains 2 calls to the Kubernetes API using 2 different names.
+// This is intended to avoid breaking changes, since the InternalFabric name has changed from GatewayServer to the GatewayServer name.
+func getInternalFabric(ctx context.Context, cl client.Client, gatewayName, remoteID, ns string) (*networkingv1beta1.InternalFabric, error) {
+	internalFabric := &networkingv1beta1.InternalFabric{}
+	err := cl.Get(ctx, client.ObjectKey{
+		Name:      remoteID,
+		Namespace: ns,
+	}, internalFabric)
+	if client.IgnoreNotFound(err) != nil {
+		return nil, fmt.Errorf("unable to get the internal fabric %q: %w", remoteID, err)
+	}
+
+	err = cl.Get(ctx, client.ObjectKey{
+		Name:      gatewayName,
+		Namespace: ns,
+	}, internalFabric)
+
+	switch {
+	case errors.IsNotFound(err):
+		return nil, fmt.Errorf("could not find internal fabric with names %q and %q: %w", gatewayName, remoteID, err)
+	case err != nil:
+		return nil, fmt.Errorf("unable to get the internal fabric %q: %w", gatewayName, err)
+	}
+
+	return internalFabric, nil
+}

pkg/gateway/fabric/geneve/internalnode_controller.go

@@ -21,7 +21,6 @@ import (
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/klog/v2"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -72,17 +71,14 @@ func (r *InternalNodeReconciler) Reconcile(ctx context.Context, req ctrl.Request
 
 	klog.V(4).Infof("Reconciling internalnode %s", req.String())
 
-	// The internal fabric has the same name of the gateway resource.
-	internalFabricName := r.Options.GwOptions.Name
-	id, err := geneve.GetGeneveTunnelID(ctx, r.Client, internalFabricName, internalnode.Name)
+	internalFabric, err := getInternalFabric(ctx, r.Client, r.Options.GwOptions.Name, r.Options.GwOptions.RemoteClusterID, r.Options.GwOptions.Namespace)
 	if err != nil {
-		return ctrl.Result{}, fmt.Errorf("internalnodecontroller waiting for geneve tunnel creation (with id %q): %w", id, err)
+		return ctrl.Result{}, fmt.Errorf("unable to get the internal fabric: %w", err)
 	}
 
-	internalFabric := &networkingv1beta1.InternalFabric{}
-	if err = r.Get(ctx, types.NamespacedName{
-		Name: internalFabricName, Namespace: r.Options.GwOptions.Namespace}, internalFabric); err != nil {
-		return ctrl.Result{}, fmt.Errorf("unable to get the internalfabric %q: %w", internalFabricName, err)
+	id, err := geneve.GetGeneveTunnelID(ctx, r.Client, internalFabric.Name, internalnode.Name)
+	if err != nil {
+		return ctrl.Result{}, fmt.Errorf("internalnodecontroller waiting for geneve tunnel creation (with id %q): %w", id, err)
 	}
 
 	var remoteIP *networkingv1beta1.IP

pkg/liqo-controller-manager/networking/internal-network/client-controller/client_controller.go

@@ -32,6 +32,7 @@ import (
 	"github.com/liqotech/liqo/pkg/consts"
 	internalnetwork "github.com/liqotech/liqo/pkg/liqo-controller-manager/networking/internal-network"
 	"github.com/liqotech/liqo/pkg/liqo-controller-manager/networking/internal-network/fabricipam"
+	netutils "github.com/liqotech/liqo/pkg/liqo-controller-manager/networking/utils"
 	"github.com/liqotech/liqo/pkg/utils"
 	cidrutils "github.com/liqotech/liqo/pkg/utils/cidr"
 	"github.com/liqotech/liqo/pkg/utils/getters"
@@ -106,9 +107,14 @@ func (r *ClientReconciler) ensureInternalFabric(ctx context.Context, gwClient *n
 		return fmt.Errorf("internal endpoint not found for the gateway client %q", gwClient.Name)
 	}
 
+	internalFabricName, err := netutils.ForgeInternalFabricName(ctx, r.Client, gwClient.ObjectMeta)
+	if err != nil {
+		return fmt.Errorf("unable to retrieve the cluster ID from the gateway client %q", gwClient.Name)
+	}
+
 	internalFabric := &networkingv1beta1.InternalFabric{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      gwClient.Name,
+			Name:      internalFabricName,
 			Namespace: gwClient.Namespace,
 		},
 	}
@@ -123,7 +129,11 @@ func (r *ClientReconciler) ensureInternalFabric(ctx context.Context, gwClient *n
 
 		internalFabric.Spec.GatewayIP = *gwClient.Status.InternalEndpoint.IP
 
-		if internalFabric.Spec.Interface.Node.Name, err = internalnetwork.FindFreeInterfaceName(ctx, r.Client, internalFabric); err != nil {
+		if internalFabric.Spec.Interface.Node.Name, err = internalnetwork.FindFreeInterfaceName(
+			ctx,
+			r.Client,
+			internalFabric,
+		); err != nil {
 			return err
 		}
 		ip, err := ipam.Allocate(internalFabric.GetName())

pkg/liqo-controller-manager/networking/internal-network/server-controller/server_controller.go

@@ -32,6 +32,7 @@ import (
 	"github.com/liqotech/liqo/pkg/consts"
 	internalnetwork "github.com/liqotech/liqo/pkg/liqo-controller-manager/networking/internal-network"
 	"github.com/liqotech/liqo/pkg/liqo-controller-manager/networking/internal-network/fabricipam"
+	netutils "github.com/liqotech/liqo/pkg/liqo-controller-manager/networking/utils"
 	"github.com/liqotech/liqo/pkg/utils"
 	cidrutils "github.com/liqotech/liqo/pkg/utils/cidr"
 	"github.com/liqotech/liqo/pkg/utils/getters"
@@ -106,9 +107,14 @@ func (r *ServerReconciler) ensureInternalFabric(ctx context.Context, gwServer *n
 		return fmt.Errorf("internal endpoint not found for the gateway server %q", gwServer.Name)
 	}
 
+	internalFabricName, err := netutils.ForgeInternalFabricName(ctx, r.Client, gwServer.ObjectMeta)
+	if err != nil {
+		return fmt.Errorf("unable to retrieve the cluster ID from the gateway server %q", gwServer.Name)
+	}
+
 	internalFabric := &networkingv1beta1.InternalFabric{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      gwServer.Name,
+			Name:      internalFabricName,
 			Namespace: gwServer.Namespace,
 		},
 	}

pkg/liqo-controller-manager/networking/utils/internalfabric.go

@@ -0,0 +1,34 @@
+package utils
+
+import (
+	"context"
+	"fmt"
+
+	networkingv1beta1 "github.com/liqotech/liqo/apis/networking/v1beta1"
+	"github.com/liqotech/liqo/pkg/utils/getters"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+func ForgeInternalFabricName(ctx context.Context, cl client.Client, meta metav1.ObjectMeta) (string, error) {
+	internalFabric := &networkingv1beta1.InternalFabric{}
+
+	err := cl.Get(ctx, client.ObjectKey{
+		Name:      meta.Name,
+		Namespace: meta.Namespace,
+	}, internalFabric)
+
+	switch {
+	case apierrors.IsNotFound(err):
+		remoteClusterID, err := getters.RetrieveRemoteClusterIDFromMeta(meta)
+		if err != nil {
+			return "", fmt.Errorf("unable to retrieve remote cluster ID from object %s/%s:%w",
+				meta.GetNamespace(), meta.GetName(), err)
+		}
+		return string(remoteClusterID), nil
+	case err != nil:
+		return "", fmt.Errorf("unable to get the internal fabric %q: %w", meta.Name, err)
+	}
+	return internalFabric.Name, nil
+}

pkg/utils/getters/dataGetters.go

@@ -180,3 +180,18 @@ func RetrieveClusterIDsFromObjectsLabels[T metav1.Object](objectList []T) []stri
 	}
 	return slices.Collect(maps.Keys(clusterIDs))
 }
+
+// RetrieveRemoteClusterIDFromObject retrieves the remote cluster ID from the labels of a generic kubernetes object.
+func RetrieveRemoteClusterIDFromMeta(meta metav1.ObjectMeta) (liqov1beta1.ClusterID, error) {
+	labels := meta.GetLabels()
+	if labels == nil {
+		return "", fmt.Errorf("object %s/%s has no labels", meta.GetNamespace(), meta.GetName())
+	}
+
+	clusterID, ok := labels[liqoconsts.RemoteClusterID]
+	if !ok || clusterID == "" {
+		return "", fmt.Errorf("object %s/%s has no remote cluster ID label", meta.GetNamespace(), meta.GetName())
+	}
+
+	return liqov1beta1.ClusterID(clusterID), nil
+}