feat(liqoctl): peer command choose Gateway Server Service position (cons or prov)

Author: fra98

cmd/liqoctl/cmd/peer.go

@@ -22,6 +22,7 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/util/runtime"
 
+	liqov1beta1 "github.com/liqotech/liqo/apis/core/v1beta1"
 	nwforge "github.com/liqotech/liqo/pkg/liqo-controller-manager/networking/forge"
 	"github.com/liqotech/liqo/pkg/liqoctl/completion"
 	"github.com/liqotech/liqo/pkg/liqoctl/factory"
@@ -90,8 +91,11 @@ func newPeerCommand(ctx context.Context, f *factory.Factory) *cobra.Command {
 
 	// Networking flags
 	cmd.Flags().BoolVar(&options.NetworkingDisabled, "networking-disabled", false, "Disable networking between the two clusters")
+	cmd.Flags().Var(options.ServerServiceLocation, "server-service-location",
+		fmt.Sprintf("Location of the service to expose the Gateway Server (%q or %q). Default: %q",
+			liqov1beta1.ConsumerRole, liqov1beta1.ProviderRole, nwforge.DefaultGwServerLocation))
 	cmd.Flags().Var(options.ServerServiceType, "server-service-type",
-		fmt.Sprintf("Service type of the Gateway Server service. Default: %s."+
+		fmt.Sprintf("Service type of the Gateway Server service. Default: %q."+
 			" Note: use ClusterIP only if you know what you are doing and you have a proper network configuration",
 			nwforge.DefaultGwServerServiceType))
 	cmd.Flags().Int32Var(&options.ServerServicePort, "server-service-port", nwforge.DefaultGwServerPort,
@@ -111,6 +115,7 @@ func newPeerCommand(ctx context.Context, f *factory.Factory) *cobra.Command {
 	cmd.Flags().IntVar(&options.MTU, "mtu", nwforge.DefaultMTU,
 		fmt.Sprintf("MTU of the Gateway server and client. Default: %d", nwforge.DefaultMTU))
 
+	runtime.Must(cmd.RegisterFlagCompletionFunc("server-service-location", completion.Enumeration(options.ServerServiceLocation.Allowed)))
 	runtime.Must(cmd.RegisterFlagCompletionFunc("server-service-type", completion.Enumeration(options.ServerServiceType.Allowed)))
 
 	// Authentication flags

pkg/liqo-controller-manager/networking/forge/gatewayserver.go

@@ -30,6 +30,7 @@ import (
 const (
 	DefaultGwServerType         = "networking.liqo.io/v1beta1/wggatewayservertemplates"
 	DefaultGwServerTemplateName = "wireguard-server"
+	DefaultGwServerLocation     = liqov1beta1.ProviderRole
 	DefaultGwServerServiceType  = corev1.ServiceTypeLoadBalancer
 	DefaultGwServerPort         = 51840
 	DefaultKeysDir              = "/etc/wireguard/keys"

pkg/liqoctl/peer/handler.go

@@ -20,6 +20,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 
+	liqov1beta1 "github.com/liqotech/liqo/apis/core/v1beta1"
 	nwforge "github.com/liqotech/liqo/pkg/liqo-controller-manager/networking/forge"
 	"github.com/liqotech/liqo/pkg/liqoctl/authenticate"
 	"github.com/liqotech/liqo/pkg/liqoctl/factory"
@@ -40,6 +41,7 @@ type Options struct {
 
 	// Networking options
 	NetworkingDisabled          bool
+	ServerServiceLocation       *argsutils.StringEnum
 	ServerServiceType           *argsutils.StringEnum
 	ServerServicePort           int32
 	ServerServiceNodePort       int32
@@ -65,6 +67,9 @@ type Options struct {
 func NewOptions(localFactory *factory.Factory) *Options {
 	return &Options{
 		LocalFactory: localFactory,
+		ServerServiceLocation: argsutils.NewEnum(
+			[]string{string(liqov1beta1.ConsumerRole), string(liqov1beta1.ProviderRole)},
+			string(nwforge.DefaultGwServerLocation)),
 		ServerServiceType: argsutils.NewEnum(
 			[]string{string(corev1.ServiceTypeLoadBalancer), string(corev1.ServiceTypeNodePort), string(corev1.ServiceTypeClusterIP)},
 			string(nwforge.DefaultGwServerServiceType)),
@@ -109,25 +114,34 @@ func (o *Options) RunPeer(ctx context.Context) error {
 }
 
 func ensureNetworking(ctx context.Context, o *Options) error {
+	localFactory := o.LocalFactory
+	remoteFactory := o.RemoteFactory
+
+	// Invert the local and remote factories if the server service position is Consumer.
+	if o.ServerServiceLocation.Value == string(liqov1beta1.ConsumerRole) {
+		localFactory = o.RemoteFactory
+		remoteFactory = o.LocalFactory
+	}
+
 	networkOptions := network.Options{
-		LocalFactory:  o.LocalFactory,
-		RemoteFactory: o.RemoteFactory,
+		LocalFactory:  localFactory,
+		RemoteFactory: remoteFactory,
 
 		Timeout:        o.Timeout,
 		Wait:           true,
 		SkipValidation: o.SkipValidation,
 
 		ServerGatewayType:           nwforge.DefaultGwServerType,
 		ServerTemplateName:          nwforge.DefaultGwServerTemplateName,
-		ServerTemplateNamespace:     o.RemoteFactory.LiqoNamespace,
+		ServerTemplateNamespace:     remoteFactory.LiqoNamespace,
 		ServerServiceType:           o.ServerServiceType,
 		ServerServicePort:           o.ServerServicePort,
 		ServerServiceNodePort:       o.ServerServiceNodePort,
 		ServerServiceLoadBalancerIP: o.ServerServiceLoadBalancerIP,
 
 		ClientGatewayType:       nwforge.DefaultGwClientType,
 		ClientTemplateName:      nwforge.DefaultGwClientTemplateName,
-		ClientTemplateNamespace: o.LocalFactory.LiqoNamespace,
+		ClientTemplateNamespace: localFactory.LiqoNamespace,
 		ClientConnectAddress:    o.ClientConnectAddress,
 		ClientConnectPort:       o.ClientConnectPort,