Added support for static LoadBalancerIP and NodePort

liqotech · Oct 27, 2023 · 7ef4440 · 7ef4440
1 parent fd77f16
commit 7ef4440
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 2 deletions.
diff --git a/apis/networking/v1alpha1/gatewayserver_types.go b/apis/networking/v1alpha1/gatewayserver_types.go
@@ -43,6 +43,13 @@ type Endpoint struct {
 	// +kubebuilder:default=ClusterIP
 	// +kubebuilder:validation:Enum=ClusterIP;NodePort;LoadBalancer;ExternalName
 	ServiceType corev1.ServiceType `json:"serviceType,omitempty"`
+	// NodePort specifies the node port of the endpoint.
+	// +optional
+	NodePort *int32 `json:"nodePort,omitempty"`
+	// LoadBalancerIP override the LoadBalancer IP to use a specific IP address (e.g., static LB). It is used only if service type is LoadBalancer.
+	// LoadBalancer provider must support this feature.
+	// +optional
+	LoadBalancerIP *string `json:"loadBalancerIP,omitempty"`
 }
 
 // GatewayServerSpec defines the desired state of GatewayServer.

diff --git a/apis/networking/v1alpha1/zz_generated.deepcopy.go b/apis/networking/v1alpha1/zz_generated.deepcopy.go
diff --git a/cmd/liqoctl/cmd/network.go b/cmd/liqoctl/cmd/network.go
@@ -139,6 +139,10 @@ func newNetworkConnectCommand(ctx context.Context, options *network.Options) *co
 		fmt.Sprintf("Service type of the Gateway Server. Default: %s", gatewayserver.DefaultServiceType))
 	cmd.Flags().Int32Var(&options.ServerPort, "server-port", gatewayserver.DefaultPort,
 		fmt.Sprintf("Port of the Gateway Server. Default: %d", gatewayserver.DefaultPort))
+	cmd.Flags().Int32Var(&options.ServerNodePort, "node-port", 0,
+		"Force NodePort of Gateway Server")
+	cmd.Flags().StringVar(&options.ServerLoadBalancerIP, "load-balancer-ip", "",
+		"Force LoadBalancer IP of Gateway Server")
 
 	// Client flags
 	cmd.Flags().StringVar(&options.ClientGatewayType, "client-type", gatewayclient.DefaultGatewayType,

diff --git a/deployments/liqo/charts/liqo-crds/crds/networking.liqo.io_gatewayservers.yaml b/deployments/liqo/charts/liqo-crds/crds/networking.liqo.io_gatewayservers.yaml
@@ -66,6 +66,16 @@ spec:
               endpoint:
                 description: Endpoint specifies the endpoint of the tunnel.
                 properties:
+                  loadBalancerIP:
+                    description: LoadBalancerIP override the LoadBalancer IP to use
+                      a specific IP address (e.g., static LB). It is used only if
+                      service type is LoadBalancer. LoadBalancer provider must support
+                      this feature.
+                    type: string
+                  nodePort:
+                    description: NodePort specifies the node port of the endpoint.
+                    format: int32
+                    type: integer
                   port:
                     description: Port specifies the port of the endpoint.
                     format: int32

diff --git a/pkg/liqoctl/network/handler.go b/pkg/liqoctl/network/handler.go
@@ -20,6 +20,7 @@ import (
 
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes"
+	"k8s.io/utils/ptr"
 
 	networkingv1alpha1 "github.com/liqotech/liqo/apis/networking/v1alpha1"
 	"github.com/liqotech/liqo/pkg/liqoctl/factory"
@@ -43,6 +44,8 @@ type Options struct {
 	ServerTemplateNamespace string
 	ServerServiceType       *argsutils.StringEnum
 	ServerPort              int32
+	ServerNodePort          int32
+	ServerLoadBalancerIP    string
 
 	ClientGatewayType       string
 	ClientTemplateName      string
@@ -282,6 +285,8 @@ func (o *Options) newGatewayServerForgeOptions(kubeClient kubernetes.Interface,
 		ServiceType:       v1.ServiceType(o.ServerServiceType.Value),
 		MTU:               o.MTU,
 		Port:              o.ServerPort,
+		NodePort:          ptr.To(o.ServerNodePort),
+		LoadBalancerIP:    ptr.To(o.ServerLoadBalancerIP),
 		Proxy:             o.Proxy,
 	}
 }

diff --git a/pkg/liqoctl/rest/gatewayserver/create.go b/pkg/liqoctl/rest/gatewayserver/create.go
@@ -78,6 +78,8 @@ func (o *Options) Create(ctx context.Context, options *rest.CreateOptions) *cobr
 	cmd.Flags().Var(o.ServiceType, "service-type", fmt.Sprintf("Service type of Gateway Server. Default: %s", DefaultServiceType))
 	cmd.Flags().IntVar(&o.MTU, "mtu", DefaultMTU, "MTU of Gateway Server")
 	cmd.Flags().Int32Var(&o.Port, "port", DefaultPort, "Port of Gateway Server")
+	cmd.Flags().Int32Var(&o.NodePort, "node-port", 0, "Force NodePort of Gateway Server")
+	cmd.Flags().StringVar(&o.LoadBalancerIP, "load-balancer-ip", "", "Force LoadBalancer IP of Gateway Server")
 	cmd.Flags().BoolVar(&o.Proxy, "proxy", DefaultProxy, "Enable proxy for the Gateway Server")
 	cmd.Flags().BoolVar(&o.Wait, "wait", DefaultWait, "Wait for the Gateway Server to be ready")
 

diff --git a/pkg/liqoctl/rest/gatewayserver/types.go b/pkg/liqoctl/rest/gatewayserver/types.go
@@ -17,6 +17,7 @@ package gatewayserver
 import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes"
+	"k8s.io/utils/ptr"
 
 	"github.com/liqotech/liqo/pkg/liqoctl/rest"
 	argsutils "github.com/liqotech/liqo/pkg/utils/args"
@@ -46,6 +47,8 @@ type Options struct {
 	ServiceType       *argsutils.StringEnum
 	MTU               int
 	Port              int32
+	NodePort          int32
+	LoadBalancerIP    string
 	Proxy             bool
 	Wait              bool
 }
@@ -78,6 +81,8 @@ type ForgeOptions struct {
 	ServiceType       corev1.ServiceType
 	MTU               int
 	Port              int32
+	NodePort          *int32
+	LoadBalancerIP    *string
 	Proxy             bool
 }
 
@@ -91,6 +96,8 @@ func (o *Options) getForgeOptions() *ForgeOptions {
 		ServiceType:       corev1.ServiceType(o.ServiceType.Value),
 		MTU:               o.MTU,
 		Port:              o.Port,
+		NodePort:          ptr.To(o.NodePort),
+		LoadBalancerIP:    ptr.To(o.LoadBalancerIP),
 		Proxy:             o.Proxy,
 	}
 }
diff --git a/pkg/liqoctl/rest/gatewayserver/utils.go b/pkg/liqoctl/rest/gatewayserver/utils.go
@@ -48,6 +48,7 @@ func ForgeGatewayServer(name, namespace string, o *ForgeOptions) (*networkingv1a
 
 // MutateGatewayServer mutates a GatewayServer.
 func MutateGatewayServer(gwServer *networkingv1alpha1.GatewayServer, o *ForgeOptions) error {
+	// Metadata
 	gwServer.Kind = networkingv1alpha1.GatewayServerKind
 	gwServer.APIVersion = networkingv1alpha1.GroupVersion.String()
 
@@ -56,12 +57,22 @@ func MutateGatewayServer(gwServer *networkingv1alpha1.GatewayServer, o *ForgeOpt
 	}
 	gwServer.Labels[liqoconsts.RemoteClusterID] = o.RemoteClusterID
 
+	// MTU
 	gwServer.Spec.MTU = o.MTU
+
+	// Server Endpoint
 	gwServer.Spec.Endpoint = networkingv1alpha1.Endpoint{
 		Port:        o.Port,
 		ServiceType: o.ServiceType,
 	}
+	if o.NodePort != nil && *o.NodePort != 0 {
+		gwServer.Spec.Endpoint.NodePort = o.NodePort
+	}
+	if o.LoadBalancerIP != nil && *o.LoadBalancerIP != "" {
+		gwServer.Spec.Endpoint.LoadBalancerIP = o.LoadBalancerIP
+	}
 
+	// Server Template Reference
 	gvr, err := enutils.ParseGroupVersionResource(o.GatewayType)
 	if err != nil {
 		return err