Merge pull request #26 from liquidmetal-dev/virtiofs

feat: add virtiosfs support

Author: richardcase

go.mod

@@ -1,6 +1,13 @@
 module github.com/liquidmetal-dev/fl
 
-go 1.22
+go 1.23
+
+toolchain go1.23.4
+
+replace (
+	github.com/liquidmetal-dev/flintlock/api => ../flintlock/api
+	github.com/liquidmetal-dev/flintlock/client => ../flintlock/client
+)
 
 require (
 	github.com/liquidmetal-dev/flintlock/api v0.0.0-20241227150005-3cc8809bcb11

go.sum

@@ -18,10 +18,6 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/liquidmetal-dev/flintlock/api v0.0.0-20241227150005-3cc8809bcb11 h1:Aa29z3oh3SSAqs10mgvWmlVmB17XRNLO4p56vuap4gg=
-github.com/liquidmetal-dev/flintlock/api v0.0.0-20241227150005-3cc8809bcb11/go.mod h1:Qi6hJN8sd6OvEw6eNGiBR3EFaUbOJYUOCeQa6OeEQxU=
-github.com/liquidmetal-dev/flintlock/client v0.0.0-20241227150005-3cc8809bcb11 h1:2C6y1bwLlLjUOEP9+z72UUUddtWq4u4dTZl7CDALd7k=
-github.com/liquidmetal-dev/flintlock/client v0.0.0-20241227150005-3cc8809bcb11/go.mod h1:jOUkt2HCTDPa52jW7s1Jq4zGgRgGJO7scFGXMDrMX8M=
 github.com/moby/moby v27.4.1+incompatible h1:z6detzbcLRt7U+w4ovHV+8oYpJfpHKTmUbFWPG6cudA=
 github.com/moby/moby v27.4.1+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

internal/cmd/microvm/create.go

@@ -23,7 +23,7 @@ func newCreateCommand() *cli.Command {
 	createInput := &app.CreateInput{}
 	networkInterfaces := &cli.StringSlice{}
 	metadataFromFile := &cli.StringSlice{}
-	volumes := &cli.StringSlice{}
+	containerVolumes := &cli.StringSlice{}
 
 	cmd := &cli.Command{
 		Name:  "create",
@@ -44,7 +44,7 @@ func newCreateCommand() *cli.Command {
 
 			createInput.NetworkInterfaces = networkInterfaces.Value()
 			createInput.MetadataFromFile = metadataFromFile.Value()
-			createInput.Volumes = volumes.Value()
+			createInput.AdditionalContainerVolumes = containerVolumes.Value()
 
 			if err := a.Create(ctx.Context, createInput); err != nil {
 				return fmt.Errorf("creating microvm: %s", err)
@@ -154,9 +154,14 @@ func newCreateCommand() *cli.Command {
 				Destination: &createInput.Metadata.Message,
 			},
 			&cli.StringSliceFlag{
-				Name:        "volume",
-				Usage:       "attach an additional volume, The following format: name=containerimage=mountpoint",
-				Destination: volumes,
+				Name:        "container-volume",
+				Usage:       "attach additional volumes using a container image, The following format: name=containerimage=mountpoint",
+				Destination: containerVolumes,
+			},
+			&cli.StringFlag{
+				Name:        "virtiofs-volume",
+				Usage:       "attach an additional volume using virtiofs, use the following format: name=localpath=mountpoint",
+				Destination: &createInput.AdditionalVirtioFSVolume,
 			},
 		},
 	}

pkg/app/create.go

@@ -16,6 +16,8 @@ import (
 	"github.com/liquidmetal-dev/flintlock/client/cloudinit/userdata"
 )
 
+var rootVolume = "/"
+
 func (a *app) Create(ctx context.Context, input *CreateInput) error {
 	a.logger.Debug("creating a microvm")
 
@@ -166,8 +168,8 @@ func (a *app) convertCreateInputToReq(input *CreateInput) (*flintlocktypes.Micro
 		req.Interfaces = append(req.Interfaces, apiIface)
 	}
 
-	for i := range input.Volumes {
-		volume := input.Volumes[i]
+	for i := range input.AdditionalContainerVolumes {
+		volume := input.AdditionalContainerVolumes[i]
 		volParts := strings.Split(volume, "=")
 		if len(volParts) != 3 {
 			// TODO: proper error
@@ -184,6 +186,23 @@ func (a *app) convertCreateInputToReq(input *CreateInput) (*flintlocktypes.Micro
 		}
 		req.AdditionalVolumes = append(req.AdditionalVolumes, apiVolume)
 	}
+	if input.AdditionalVirtioFSVolume != "" {
+		volParts := strings.Split(input.AdditionalVirtioFSVolume, "=")
+		if len(volParts) != 3 {
+			// TODO: proper error
+			return nil, fmt.Errorf("volume not in correct format, expect name=localpath=mountpoint")
+		}
+
+		apiVolume := &flintlocktypes.Volume{
+			Id:         volParts[0],
+			IsReadOnly: false,
+			MountPoint: &volParts[2],
+			Source: &flintlocktypes.VolumeSource{
+				VirtiofsSource: &volParts[1],
+			},
+		}
+		req.AdditionalVolumes = append(req.AdditionalVolumes, apiVolume)
+	}
 
 	return req, nil
 }

pkg/app/delete.go

@@ -27,5 +27,4 @@ func (a *app) Delete(ctx context.Context, input *DeleteInput) error {
 	a.logger.Infow("deleted microvm", "uid", input.UID, "host", input.Host)
 
 	return nil
-
 }

pkg/app/types.go

@@ -1,22 +1,23 @@
 package app
 
 type CreateInput struct {
-	Host              string
-	Name              string
-	NameAutogenerate  bool
-	Namespace         string
-	VCPU              int
-	MemoryInMb        int
-	KernelImage       string
-	KernelAddNetConf  bool
-	KernelFileName    string
-	RootImage         string
-	InitrdImage       string
-	InitrdFilename    string
-	NetworkInterfaces []string
-	MetadataFromFile  []string
-	Metadata          Metadata
-	Volumes           []string
+	Host                       string
+	Name                       string
+	NameAutogenerate           bool
+	Namespace                  string
+	VCPU                       int
+	MemoryInMb                 int
+	KernelImage                string
+	KernelAddNetConf           bool
+	KernelFileName             string
+	RootImage                  string
+	InitrdImage                string
+	InitrdFilename             string
+	NetworkInterfaces          []string
+	MetadataFromFile           []string
+	Metadata                   Metadata
+	AdditionalContainerVolumes []string
+	AdditionalVirtioFSVolume   string
 }
 
 type Metadata struct {