liqoctl add network configuration commands

cmd/liqoctl/cmd/root.go

@@ -33,14 +33,19 @@ import (
 	"github.com/liqotech/liqo/pkg/liqoctl/create"
 	"github.com/liqotech/liqo/pkg/liqoctl/delete"
 	"github.com/liqotech/liqo/pkg/liqoctl/factory"
+	"github.com/liqotech/liqo/pkg/liqoctl/get"
 	"github.com/liqotech/liqo/pkg/liqoctl/rest"
+	"github.com/liqotech/liqo/pkg/liqoctl/rest/configuration"
+	"github.com/liqotech/liqo/pkg/liqoctl/rest/localconfiguration"
 	"github.com/liqotech/liqo/pkg/liqoctl/rest/virtualnode"
 )
 
 var liqoctl string
 
 var liqoResources = []rest.APIProvider{
 	virtualnode.VirtualNode,
+	localconfiguration.LocalConfiguration,
+	configuration.Configuration,
 }
 
 func init() {
@@ -125,6 +130,7 @@ func NewRootCommand(ctx context.Context) *cobra.Command {
 	cmd.AddCommand(newMoveCommand(ctx, f))
 	cmd.AddCommand(newVersionCommand(ctx, f))
 	cmd.AddCommand(newDocsCommand(ctx))
+	cmd.AddCommand(get.NewGetCommand(ctx, liqoResources, f))
 	cmd.AddCommand(create.NewCreateCommand(ctx, liqoResources, f))
 	cmd.AddCommand(delete.NewDeleteCommand(ctx, liqoResources, f))
 	return cmd

cmd/liqoctl/main.go

@@ -26,6 +26,7 @@ import (
 
 	discoveryv1alpha1 "github.com/liqotech/liqo/apis/discovery/v1alpha1"
 	netv1alpha1 "github.com/liqotech/liqo/apis/net/v1alpha1"
+	networkingv1alpha1 "github.com/liqotech/liqo/apis/networking/v1alpha1"
 	offloadingv1alpha1 "github.com/liqotech/liqo/apis/offloading/v1alpha1"
 	sharingv1alpha1 "github.com/liqotech/liqo/apis/sharing/v1alpha1"
 	virtualkubeletv1alpha1 "github.com/liqotech/liqo/apis/virtualkubelet/v1alpha1"
@@ -38,6 +39,7 @@ func init() {
 	utilruntime.Must(offloadingv1alpha1.AddToScheme(scheme.Scheme))
 	utilruntime.Must(sharingv1alpha1.AddToScheme(scheme.Scheme))
 	utilruntime.Must(virtualkubeletv1alpha1.AddToScheme(scheme.Scheme))
+	utilruntime.Must(networkingv1alpha1.AddToScheme(scheme.Scheme))
 }
 
 func main() {

pkg/liqoctl/get/doc.go

@@ -0,0 +1,16 @@
+// Copyright 2019-2023 The Liqo Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package get contains the implementation of the 'get' command
+package get

pkg/liqoctl/get/types.go

@@ -0,0 +1,51 @@
+// Copyright 2019-2023 The Liqo Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package get
+
+import (
+	"context"
+
+	"github.com/spf13/cobra"
+
+	"github.com/liqotech/liqo/pkg/liqoctl/factory"
+	"github.com/liqotech/liqo/pkg/liqoctl/rest"
+)
+
+// NewGetCommand returns the cobra command for the get subcommand.
+func NewGetCommand(ctx context.Context, liqoResources []rest.APIProvider, f *factory.Factory) *cobra.Command {
+	options := &rest.GetOptions{
+		Factory: f,
+	}
+
+	cmd := &cobra.Command{
+		Use:   "get",
+		Short: "Get Liqo resources",
+		Long:  "Get Liqo resources.",
+		Args:  cobra.NoArgs,
+	}
+
+	f.AddNamespaceFlag(cmd.PersistentFlags())
+
+	for _, r := range liqoResources {
+		api := r()
+
+		apiOptions := api.APIOptions()
+		if apiOptions.EnableGet {
+			cmd.AddCommand(api.Get(ctx, options))
+		}
+	}
+
+	return cmd
+}

pkg/liqoctl/rest/configuration/create.go

@@ -0,0 +1,178 @@
+// Copyright 2019-2023 The Liqo Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package configuration
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"time"
+
+	"github.com/spf13/cobra"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/runtime"
+	"k8s.io/apimachinery/pkg/util/wait"
+	"k8s.io/cli-runtime/pkg/printers"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+
+	networkingv1alpha1 "github.com/liqotech/liqo/apis/networking/v1alpha1"
+	"github.com/liqotech/liqo/pkg/discovery"
+	"github.com/liqotech/liqo/pkg/liqoctl/completion"
+	"github.com/liqotech/liqo/pkg/liqoctl/output"
+	"github.com/liqotech/liqo/pkg/liqoctl/rest"
+	"github.com/liqotech/liqo/pkg/utils/args"
+)
+
+const liqoctlCreateConfigurationLongHelp = `Create a Configuration.
+
+The Configuration resource is used to represent a remote cluster network configuration.
+
+Examples:
+  $ {{ .Executable }} create configuration my-cluster --cluster-id my-cluster-id \
+  --pod-cidr 10.0.0.0/16 --external-cidr 10.10.0.0/16`
+
+// Create creates a Configuration.
+func (o *Options) Create(ctx context.Context, options *rest.CreateOptions) *cobra.Command {
+	outputFormat := args.NewEnum([]string{"json", "yaml"}, "")
+
+	o.createOptions = options
+
+	cmd := &cobra.Command{
+		Use:     "configuration",
+		Aliases: []string{"config", "configurations"},
+		Short:   "Create a Configuration",
+		Long:    liqoctlCreateConfigurationLongHelp,
+		Args:    cobra.ExactArgs(1),
+
+		PreRun: func(cmd *cobra.Command, args []string) {
+			options.OutputFormat = outputFormat.Value
+			options.Name = args[0]
+			o.createOptions = options
+		},
+
+		Run: func(cmd *cobra.Command, args []string) {
+			output.ExitOnErr(o.handleCreate(ctx))
+		},
+	}
+
+	cmd.Flags().VarP(outputFormat, "output", "o",
+		"Output the resulting VirtualNode resource, instead of applying it. Supported formats: json, yaml")
+
+	cmd.Flags().StringVar(&o.ClusterID, "cluster-id", "", "The cluster ID of the remote cluster")
+	cmd.Flags().Var(&o.PodCIDR, "pod-cidr", "The pod CIDR of the remote cluster")
+	cmd.Flags().Var(&o.ExternalCIDR, "external-cidr", "The external CIDR of the remote cluster")
+	cmd.Flags().BoolVar(&o.Wait, "wait", false, "Wait for the Configuration to be ready")
+
+	runtime.Must(cmd.MarkFlagRequired("cluster-id"))
+	runtime.Must(cmd.MarkFlagRequired("pod-cidr"))
+	runtime.Must(cmd.MarkFlagRequired("external-cidr"))
+
+	runtime.Must(cmd.RegisterFlagCompletionFunc("output", completion.Enumeration(outputFormat.Allowed)))
+	runtime.Must(cmd.RegisterFlagCompletionFunc("cluster-id", completion.ClusterIDs(ctx,
+		o.createOptions.Factory, completion.NoLimit)))
+
+	return cmd
+}
+
+func (o *Options) handleCreate(ctx context.Context) error {
+	opts := o.createOptions
+	if opts.OutputFormat != "" {
+		opts.Printer.CheckErr(o.output())
+		return nil
+	}
+
+	s := opts.Printer.StartSpinner("Creating configuration")
+
+	conf := o.forgeConfiguration(o.ClusterID, o.PodCIDR.String(), o.ExternalCIDR.String())
+	_, err := controllerutil.CreateOrUpdate(ctx, opts.CRClient, conf, func() error {
+		o.mutateConfiguration(conf)
+		return nil
+	})
+	if err != nil {
+		s.Fail("Unable to create configuration: %v", output.PrettyErr(err))
+		return err
+	}
+	s.Success("Configuration created")
+
+	if o.Wait {
+		s = opts.Printer.StartSpinner("Waiting for configuration to be ready")
+		interval := 1 * time.Second
+		if err := wait.PollUntilContextCancel(ctx, interval, false, func(context.Context) (done bool, err error) {
+			var appliedConf networkingv1alpha1.Configuration
+			err = opts.CRClient.Get(ctx, types.NamespacedName{
+				Namespace: conf.Namespace,
+				Name:      conf.Name,
+			}, &appliedConf)
+			if err != nil {
+				return false, err
+			}
+
+			return appliedConf.Status.Remote != nil, nil
+		}); err != nil {
+			s.Fail("Unable to wait for configuration to be ready: %v", output.PrettyErr(err))
+			return err
+		}
+		s.Success("Configuration is ready")
+	}
+
+	return nil
+}
+
+func (o *Options) forgeConfiguration(clusterID, podCIDR, externalCIDR string) *networkingv1alpha1.Configuration {
+	conf := &networkingv1alpha1.Configuration{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       networkingv1alpha1.ConfigurationKind,
+			APIVersion: networkingv1alpha1.GroupVersion.String(),
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      o.createOptions.Name,
+			Namespace: o.createOptions.Namespace,
+			Labels: map[string]string{
+				discovery.ClusterIDLabel: clusterID,
+			},
+		},
+	}
+	o.mutateConfiguration(conf)
+	return conf
+}
+
+func (o *Options) mutateConfiguration(conf *networkingv1alpha1.Configuration) {
+	conf.Kind = networkingv1alpha1.ConfigurationKind
+	conf.APIVersion = networkingv1alpha1.GroupVersion.String()
+	if conf.Labels == nil {
+		conf.Labels = make(map[string]string)
+	}
+	conf.Labels[discovery.ClusterIDLabel] = conf.Name
+	conf.Spec.Remote.CIDR.Pod = networkingv1alpha1.CIDR(o.PodCIDR.String())
+	conf.Spec.Remote.CIDR.External = networkingv1alpha1.CIDR(o.ExternalCIDR.String())
+}
+
+// output implements the logic to output the generated VirtualNode resource.
+func (o *Options) output() error {
+	opts := o.createOptions
+	var printer printers.ResourcePrinter
+	switch opts.OutputFormat {
+	case "yaml":
+		printer = &printers.YAMLPrinter{}
+	case "json":
+		printer = &printers.JSONPrinter{}
+	default:
+		return fmt.Errorf("unsupported output format %q", opts.OutputFormat)
+	}
+
+	conf := o.forgeConfiguration(o.ClusterID, o.PodCIDR.String(), o.ExternalCIDR.String())
+	return printer.PrintObj(conf, os.Stdout)
+}

pkg/liqoctl/rest/configuration/delete.go

@@ -0,0 +1,28 @@
+// Copyright 2019-2023 The Liqo Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package configuration
+
+import (
+	"context"
+
+	"github.com/spf13/cobra"
+
+	"github.com/liqotech/liqo/pkg/liqoctl/rest"
+)
+
+// Delete deletes a Configuration.
+func (o *Options) Delete(_ context.Context, _ *rest.DeleteOptions) *cobra.Command {
+	panic("not implemented")
+}

pkg/liqoctl/rest/configuration/get.go

@@ -0,0 +1,28 @@
+// Copyright 2019-2023 The Liqo Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package configuration
+
+import (
+	"context"
+
+	"github.com/spf13/cobra"
+
+	"github.com/liqotech/liqo/pkg/liqoctl/rest"
+)
+
+// Get implements the get command.
+func (o *Options) Get(_ context.Context, _ *rest.GetOptions) *cobra.Command {
+	panic("not implemented")
+}

pkg/liqoctl/rest/configuration/types.go

@@ -0,0 +1,44 @@
+// Copyright 2019-2023 The Liqo Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package configuration
+
+import (
+	"github.com/liqotech/liqo/pkg/liqoctl/rest"
+	"github.com/liqotech/liqo/pkg/utils/args"
+)
+
+// Options encapsulates the arguments of the configuration command.
+type Options struct {
+	createOptions *rest.CreateOptions
+
+	ClusterID    string
+	PodCIDR      args.CIDR
+	ExternalCIDR args.CIDR
+	Wait         bool
+}
+
+var _ rest.API = &Options{}
+
+// LocalConfiguration returns the rest API for the configuration command.
+func Configuration() rest.API {
+	return &Options{}
+}
+
+// APIOptions returns the APIOptions for the configuration API.
+func (o *Options) APIOptions() *rest.APIOptions {
+	return &rest.APIOptions{
+		EnableCreate: true,
+	}
+}