adding virtiofs vol (#11)

Signed-off-by: Steve Fraser <steve@cast.ai>

Author: steve-fraser

.github/workflows/test.yaml

@@ -17,6 +17,6 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.19'
+          go-version: '1.23.1'
       - name: Run tests
         run: go test ./...

services/microvm/convert.go

@@ -4,8 +4,8 @@
 package microvm
 
 import (
-	types "github.com/weaveworks-liquidmetal/controller-pkg/types/microvm"
-	flintlocktypes "github.com/weaveworks-liquidmetal/flintlock/api/types"
+	types "github.com/liquidmetal-dev/controller-pkg/types/microvm"
+	flintlocktypes "github.com/liquidmetal-dev/flintlock/api/types"
 )
 
 const platformLiquidMetal = "liquid_metal"
@@ -113,15 +113,17 @@ func withAdditionalVolumes(volumes []types.Volume) specOption {
 	return func(s *flintlocktypes.MicroVMSpec) {
 		for i := range volumes {
 			volume := volumes[i]
-
 			addVol := &flintlocktypes.Volume{
 				Id:         volume.ID,
 				IsReadOnly: volume.ReadOnly,
-				Source: &flintlocktypes.VolumeSource{
-					ContainerSource: &volume.Image,
-				},
+				Source: &flintlocktypes.VolumeSource{},
+			}
+			if volume.Image != "" {
+				addVol.Source.ContainerSource = &volume.Image
+			}
+			if volume.VirtioFSPath != "" {
+				addVol.Source.VirtiofsSource = &volume.VirtioFSPath
 			}
-
 			if volume.MountPoint != "" {
 				addVol.MountPoint = &volume.MountPoint
 			}

services/microvm/convert_test.go

@@ -6,9 +6,9 @@ import (
 	. "github.com/onsi/gomega"
 	"k8s.io/utils/pointer"
 
-	"github.com/weaveworks-liquidmetal/controller-pkg/services/microvm/fakes"
-	"github.com/weaveworks-liquidmetal/controller-pkg/types/microvm"
-	flintlocktypes "github.com/weaveworks-liquidmetal/flintlock/api/types"
+	"github.com/liquidmetal-dev/controller-pkg/services/microvm/fakes"
+	"github.com/liquidmetal-dev/controller-pkg/types/microvm"
+	flintlocktypes "github.com/liquidmetal-dev/flintlock/api/types"
 )
 
 func Test_convertToFlintlockAPI(t *testing.T) {
@@ -145,6 +145,33 @@ func Test_convertToFlintlockAPI(t *testing.T) {
 				g.Expect(converted.AdditionalVolumes[1].IsReadOnly).To(BeTrue())
 			},
 		},
+		{
+			name: "withAdditionalVolumes has virtiofs mount",
+			input: microvm.VMSpec{
+				AdditionalVolumes: []microvm.Volume{
+					{
+						ID:       strVal1,
+						ReadOnly: false,
+						VirtioFSPath: strVal2,
+					},
+					{
+						ID:       strVal3,
+						Image:    strVal4,
+						ReadOnly: true,
+					},
+				},
+			},
+			expected: func(g *WithT, converted *flintlocktypes.MicroVMSpec) {
+				g.Expect(converted.AdditionalVolumes).To(HaveLen(2))
+
+				g.Expect(converted.AdditionalVolumes[0].Id).To(Equal(strVal1))
+				g.Expect(*converted.AdditionalVolumes[0].Source.VirtiofsSource).To(Equal(strVal2))
+				g.Expect(converted.AdditionalVolumes[0].IsReadOnly).To(BeFalse())
+				g.Expect(converted.AdditionalVolumes[1].Id).To(Equal(strVal3))
+				g.Expect(*converted.AdditionalVolumes[1].Source.ContainerSource).To(Equal(strVal4))
+				g.Expect(converted.AdditionalVolumes[1].IsReadOnly).To(BeTrue())
+			},
+		},
 		{
 			name: "withAdditionalVolumes, has mountpoint",
 			input: microvm.VMSpec{

services/microvm/fakes/fake_scope.go

@@ -1,30 +1,29 @@
-module github.com/weaveworks-liquidmetal/controller-pkg/services/microvm
+module github.com/liquidmetal-dev/controller-pkg/services/microvm
 
-go 1.19
+go 1.23
 
 require (
+	github.com/liquidmetal-dev/controller-pkg/client v0.0.0-20250206153520-fa7b57540c18
+	github.com/liquidmetal-dev/controller-pkg/types/microvm v0.0.0-20250207115528-f599d8cc9a1d
+	github.com/liquidmetal-dev/flintlock/api v0.0.0-20250205095343-755c4154ea88
+	github.com/liquidmetal-dev/flintlock/client v0.0.0-20250205095343-755c4154ea88
 	github.com/onsi/gomega v1.24.1
-	github.com/weaveworks-liquidmetal/controller-pkg/client v0.0.0-20230116125931-089fb91de682
-	github.com/weaveworks-liquidmetal/controller-pkg/types/microvm v0.0.0-20230531120904-dd84ec5eab9f
-	github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20230522070730-18c06de56a20
-	github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20230522070730-18c06de56a20
 	github.com/yitsushi/macpot v1.0.2
-	google.golang.org/protobuf v1.28.1
+	google.golang.org/protobuf v1.34.1
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2
 )
 
 require (
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.6.0 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
 	github.com/kr/text v0.2.0 // indirect
+	github.com/rogpeppe/go-internal v1.13.1 // indirect
 	github.com/stretchr/testify v1.8.0 // indirect
-	golang.org/x/net v0.8.0 // indirect
-	golang.org/x/sys v0.6.0 // indirect
-	golang.org/x/text v0.8.0 // indirect
-	google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90 // indirect
-	google.golang.org/grpc v1.50.1 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
+	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
+	google.golang.org/grpc v1.64.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )