feat: Convert volumes with MountPoint

In line with changes to our image-builder pipeline, which removes the embedded kernel modules from the OS image, this feature adds an option to include modules as an additional volume. Part of liquidmetal-dev/image-builder#49
liquidmetal-dev · Jan 13, 2023 · f1ccd24 · f1ccd24
1 parent eaa53ce
commit f1ccd24
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/services/microvm/convert.go b/services/microvm/convert.go
@@ -47,13 +47,19 @@ func convertToFlintlockAPI(mvmScope Scope) *flintlocktypes.MicroVMSpec {
 	for i := range mvmSpec.AdditionalVolumes {
 		volume := mvmSpec.AdditionalVolumes[i]
 
-		apiVM.AdditionalVolumes = append(apiVM.AdditionalVolumes, &flintlocktypes.Volume{
+		addVol := &flintlocktypes.Volume{
 			Id:         volume.ID,
 			IsReadOnly: volume.ReadOnly,
 			Source: &flintlocktypes.VolumeSource{
 				ContainerSource: &volume.Image,
 			},
-		})
+		}
+
+		if volume.MountPoint != "" {
+			addVol.MountPoint = &volume.MountPoint
+		}
+
+		apiVM.AdditionalVolumes = append(apiVM.AdditionalVolumes, addVol)
 	}
 
 	apiVM.Interfaces = []*flintlocktypes.NetworkInterface{}

diff --git a/services/microvm/go.mod b/services/microvm/go.mod
@@ -4,9 +4,9 @@ go 1.19
 
 require (
 	github.com/weaveworks-liquidmetal/controller-pkg/client v0.0.0-20221117135625-e87f6fda7332
-	github.com/weaveworks-liquidmetal/controller-pkg/types/microvm v0.0.0-20221117135625-e87f6fda7332
-	github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20221108110312-4cf137879fb2
-	github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20221108110312-4cf137879fb2
+	github.com/weaveworks-liquidmetal/controller-pkg/types/microvm v0.0.0-20230113163837-eaa53ce86ced
+	github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20230109155544-97f4f12ca184
+	github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20230109155544-97f4f12ca184
 	github.com/yitsushi/macpot v1.0.2
 	google.golang.org/protobuf v1.28.1
 	gopkg.in/yaml.v2 v2.4.0

diff --git a/services/microvm/go.sum b/services/microvm/go.sum
@@ -145,12 +145,12 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/weaveworks-liquidmetal/controller-pkg/client v0.0.0-20221117135625-e87f6fda7332 h1:13rEU/dqAYqBFH4Uc1gcfwr9pcKuF7+7B+r2HNebDkI=
 github.com/weaveworks-liquidmetal/controller-pkg/client v0.0.0-20221117135625-e87f6fda7332/go.mod h1:0snthlwNQ731b4CPJtSZ8I76FgS02wAOfyar9ss+X+U=
-github.com/weaveworks-liquidmetal/controller-pkg/types/microvm v0.0.0-20221117135625-e87f6fda7332 h1:S9SmM98mgDe/teb+JCneI6Gu6fxzUIn/ATiffj88jf0=
-github.com/weaveworks-liquidmetal/controller-pkg/types/microvm v0.0.0-20221117135625-e87f6fda7332/go.mod h1:KPlbfZsmo9xlfzl98cFBqGYc9hpgSYljICR+LrqKJUA=
-github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20221108110312-4cf137879fb2 h1:6BACjW2rZrpWvzK+T7sQ0dn0LOWw8u8LduoTkan58Ts=
-github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20221108110312-4cf137879fb2/go.mod h1:JPML9O56MoPKGX97jfj++BtuFFS84jm4T+jWQBjO5Uc=
-github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20221108110312-4cf137879fb2 h1:lC8NG5ka+MSXktrSgpmiDKvkr5kVB62vcWhU1XRahk4=
-github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20221108110312-4cf137879fb2/go.mod h1:d65mpsT+pbMnMJZhUqeNtt7lcQnsX8cowl9dTRkniSI=
+github.com/weaveworks-liquidmetal/controller-pkg/types/microvm v0.0.0-20230113163837-eaa53ce86ced h1:hfGjJ67AmFlxyUlyui176vKVtWZUd24OwzYa7lfVtfo=
+github.com/weaveworks-liquidmetal/controller-pkg/types/microvm v0.0.0-20230113163837-eaa53ce86ced/go.mod h1:KPlbfZsmo9xlfzl98cFBqGYc9hpgSYljICR+LrqKJUA=
+github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20230109155544-97f4f12ca184 h1:o0CJeY1Dbq+xxw5mx32S+5nOft5nf2NZMjIbHlLvFpQ=
+github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20230109155544-97f4f12ca184/go.mod h1:JPML9O56MoPKGX97jfj++BtuFFS84jm4T+jWQBjO5Uc=
+github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20230109155544-97f4f12ca184 h1:7vrApNvF61104ULFq5lzH1IGfIE+94MwV/SmXlYvss0=
+github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20230109155544-97f4f12ca184/go.mod h1:d65mpsT+pbMnMJZhUqeNtt7lcQnsX8cowl9dTRkniSI=
 github.com/yitsushi/macpot v1.0.2 h1:LSiBfVKRhzrvUTBDO2GZYAQvS+gG9wdzPaaiNeR29KM=
 github.com/yitsushi/macpot v1.0.2/go.mod h1:7KBzokvUNbcsR1VcmKwmYRWB2FyAWcIll4L93b2A8q4=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=