Network: gateway routes

Co-authored-by: Alessandro Olivero <[email protected]>

Author: cheina97

.github/workflows/integration.yml

@@ -8,6 +8,7 @@ on:
       - network-general
       - network-external
       - network-internal
+      - frc/gatewayroute 
   repository_dispatch:
     types:
       - test-command

apis/networking/v1alpha1/internalfabric_types.go

@@ -40,11 +40,19 @@ type InternalFabricSpecInterfaceNode struct {
 	Name string `json:"name"`
 }
 
+// InternalFabricSpecInterfaceGateway contains the information about the gateway interface.
+type InternalFabricSpecInterfaceGateway struct {
+	// IP is the IP of the interface added to the gateway.
+	IP IP `json:"ip"`
+}
+
 // InternalFabricSpecInterface contains the information about network interfaces.
 type InternalFabricSpecInterface struct {
 	// Node contains the information about the node interface.
 	// The node interface is created on every node to connect them to the gateway related with the internalfabric.
 	Node InternalFabricSpecInterfaceNode `json:"node"`
+	// Gateway contains the information about the gateway interface.
+	Gateway InternalFabricSpecInterfaceGateway `json:"gateway"`
 }
 
 // InternalFabricSpec defines the desired state of InternalFabric.

apis/networking/v1alpha1/internalnode_types.go

@@ -40,11 +40,19 @@ type InternalNodeSpecInterfaceGateway struct {
 	Name string `json:"name"`
 }
 
+// InternalNodeSpecInterfaceNode contains the information about the node interface.
+type InternalNodeSpecInterfaceNode struct {
+	// IP is the IP of the interface added to the node.
+	IP IP `json:"ip"`
+}
+
 // InternalNodeSpecInterface contains the information about network interfaces.
 type InternalNodeSpecInterface struct {
 	// Gateway contains the information about the gateway interface.
 	// The gateway interface is created on every gateway to connect them to the node related with the internalnode.
 	Gateway InternalNodeSpecInterfaceGateway `json:"gateway"`
+	// Node contains the information about the node interface.
+	Node InternalNodeSpecInterfaceNode `json:"node"`
 }
 
 // InternalNodeSpec defines the desired state of InternalNode.

apis/networking/v1alpha1/routeconfiguration_types.go

@@ -15,6 +15,7 @@
 package v1alpha1
 
 import (
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
@@ -34,6 +35,22 @@ var RouteConfigurationGroupResource = schema.GroupResource{Group: GroupVersion.G
 // RouteConfigurationGroupVersionResource is groupResourceVersion used to register these objects.
 var RouteConfigurationGroupVersionResource = GroupVersion.WithResource(RouteConfigurationResource)
 
+// Scope is the scope of the route.
+type Scope string
+
+const (
+	// GlobalScope is the global scope of the RouteConfiguration.
+	GlobalScope Scope = "global"
+	// LinkScope is the link scope of the RouteConfiguration.
+	LinkScope Scope = "link"
+	// HostScope is the host scope of the RouteConfiguration.
+	HostScope Scope = "host"
+	// SiteScope is the site scope of the RouteConfiguration.
+	SiteScope Scope = "site"
+	// NowhereScope is the nowhere scope of the RouteConfiguration.
+	NowhereScope Scope = "nowhere"
+)
+
 // Route is the route of the RouteConfiguration.
 type Route struct {
 	// Dst is the destination of the RouteConfiguration.
@@ -46,6 +63,12 @@ type Route struct {
 	Dev *string `json:"dev,omitempty"`
 	// Onlink enables the onlink falg inside the route.
 	Onlink *bool `json:"onlink,omitempty"`
+	// Scope is the scope of the RouteConfiguration.
+	// +kubebuilder:validation:Enum=global;link;host;site;nowhere
+	Scope *Scope `json:"scope,omitempty"`
+	// TargetRef is the reference to the target object of the route.
+	// It is optional and it can be used for custom purposes.
+	TargetRef *corev1.ObjectReference `json:"targetRef,omitempty"`
 }
 
 // Rule is the rule of the RouteConfiguration.
@@ -61,6 +84,9 @@ type Rule struct {
 	// Routes is the list of routes of the Rule.
 	// +kubebuilder:validation:MinItems=1
 	Routes []Route `json:"routes"`
+	// TargetRef is the reference to the target object of the route.
+	// It is optional and it can be used for custom purposes.
+	TargetRef *corev1.ObjectReference `json:"targetRef,omitempty"`
 }
 
 // Table is the table of the RouteConfiguration.
@@ -70,6 +96,9 @@ type Table struct {
 	// Rules is the list of rules of the RouteConfiguration.
 	// +kubebuilder:validation:MinItems=1
 	Rules []Rule `json:"rules"`
+	// TargetRef is the reference to the target object of the route.
+	// It is optional and it can be used for custom purposes.
+	TargetRef *corev1.ObjectReference `json:"targetRef,omitempty"`
 }
 
 // RouteConfigurationSpec defines the desired state of RouteConfiguration.

apis/networking/v1alpha1/zz_generated.deepcopy.go

@@ -152,7 +152,7 @@ func run(cmd *cobra.Command, _ []string) error {
 		mgr.GetClient(),
 		mgr.GetScheme(),
 		mgr.GetEventRecorderFor("route-controller"),
-		fabric.ForgeRouteTargetLabels(),
+		[]route.LabelsSet{fabric.ForgeRouteTargetLabels()},
 	)
 	if err != nil {
 		return fmt.Errorf("unable to create route configuration reconciler: %w", err)

cmd/fabric/main.go

@@ -32,16 +32,16 @@ import (
 
 	networkingv1alpha1 "github.com/liqotech/liqo/apis/networking/v1alpha1"
 	"github.com/liqotech/liqo/pkg/gateway"
+	"github.com/liqotech/liqo/pkg/gateway/fabric"
 	"github.com/liqotech/liqo/pkg/gateway/fabric/geneve"
-	"github.com/liqotech/liqo/pkg/route"
 	flagsutils "github.com/liqotech/liqo/pkg/utils/flags"
 	"github.com/liqotech/liqo/pkg/utils/mapper"
 	"github.com/liqotech/liqo/pkg/utils/restcfg"
 )
 
 var (
 	scheme  = runtime.NewScheme()
-	options = geneve.NewOptions(gateway.NewOptions())
+	options = fabric.NewOptions(gateway.NewOptions())
 )
 
 func init() {
@@ -62,8 +62,8 @@ func main() {
 	klog.InitFlags(legacyflags)
 	flagsutils.FromFlagToPflag(legacyflags, cmd.Flags())
 
-	geneve.InitFlags(cmd.Flags(), options)
-	if err := geneve.MarkFlagsRequired(&cmd); err != nil {
+	fabric.InitFlags(cmd.Flags(), options)
+	if err := fabric.MarkFlagsRequired(&cmd); err != nil {
 		klog.Error(err)
 		os.Exit(1)
 	}
@@ -113,20 +113,6 @@ func run(cmd *cobra.Command, _ []string) error {
 		return fmt.Errorf("unable to create manager: %w", err)
 	}
 
-	rcr, err := route.NewRouteConfigurationReconcilerWithoutFinalizer(
-		mgr.GetClient(),
-		mgr.GetScheme(),
-		mgr.GetEventRecorderFor("routeconfiguration-controller"),
-		geneve.ForgeRouteTargetLabels(options.GwOptions.Name),
-	)
-	if err != nil {
-		return fmt.Errorf("unable to create routeconfiguration reconciler: %w", err)
-	}
-
-	if err := rcr.SetupWithManager(mgr); err != nil {
-		return fmt.Errorf("unable to setup routeconfiguration reconciler: %w", err)
-	}
-
 	inr, err := geneve.NewInternalNodeReconciler(
 		mgr.GetClient(),
 		mgr.GetScheme(),

cmd/gateway/geneve/main.go

@@ -27,7 +27,6 @@ import (
 	"k8s.io/client-go/tools/leaderelection/resourcelock"
 	"k8s.io/klog/v2"
 	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
@@ -37,8 +36,11 @@ import (
 	"github.com/liqotech/liqo/pkg/gateway"
 	"github.com/liqotech/liqo/pkg/gateway/connection"
 	"github.com/liqotech/liqo/pkg/gateway/connection/conncheck"
+	"github.com/liqotech/liqo/pkg/gateway/fabric"
 	"github.com/liqotech/liqo/pkg/gateway/remapping"
+	"github.com/liqotech/liqo/pkg/route"
 	flagsutils "github.com/liqotech/liqo/pkg/utils/flags"
+	"github.com/liqotech/liqo/pkg/utils/kernel"
 	"github.com/liqotech/liqo/pkg/utils/mapper"
 	"github.com/liqotech/liqo/pkg/utils/restcfg"
 )
@@ -98,6 +100,11 @@ func main() {
 func run(cmd *cobra.Command, _ []string) error {
 	var err error
 
+	// Enable ip_forwarding.
+	if err = kernel.EnableIPForwarding(); err != nil {
+		return err
+	}
+
 	// Set controller-runtime logger.
 	log.SetLogger(klog.NewKlogr())
 
@@ -108,11 +115,6 @@ func run(cmd *cobra.Command, _ []string) error {
 	mgr, err := ctrl.NewManager(cfg, ctrl.Options{
 		MapperProvider: mapper.LiqoMapperProvider(scheme),
 		Scheme:         scheme,
-		Cache: cache.Options{
-			DefaultNamespaces: map[string]cache.Config{
-				connoptions.GwOptions.Namespace: {},
-			},
-		},
 		Metrics: server.Options{
 			BindAddress: "0", // Metrics are exposed by "connection" container.
 		},
@@ -151,6 +153,23 @@ func run(cmd *cobra.Command, _ []string) error {
 		}
 	}
 
+	rcr, err := route.NewRouteConfigurationReconcilerWithoutFinalizer(
+		mgr.GetClient(),
+		mgr.GetScheme(),
+		mgr.GetEventRecorderFor("routeconfiguration-controller"),
+		[]route.LabelsSet{
+			fabric.ForgeRouteExternalTargetLabels(connoptions.GwOptions.RemoteClusterID),
+			fabric.ForgeRouteInternalTargetLabels(),
+		},
+	)
+	if err != nil {
+		return fmt.Errorf("unable to create routeconfiguration reconciler: %w", err)
+	}
+
+	if err := rcr.SetupWithManager(mgr); err != nil {
+		return fmt.Errorf("unable to setup routeconfiguration reconciler: %w", err)
+	}
+
 	// Setup the firewall configuration controller.
 	fwcr, err := firewall.NewFirewallConfigurationReconcilerWithoutFinalizer(
 		mgr.GetClient(),