chore: Bump flintlock to 0.5.0 (#71)

Author: Callisto13

example.json

@@ -7,17 +7,27 @@
     "vcpu": 2,
     "memory_in_mb": 2048,
     "kernel": {
-      "image": "ghcr.io/weaveworks/flintlock-kernel:5.10.77",
+      "image": "ghcr.io/weaveworks-liquidmetal/kernel-bin:5.10.77",
       "filename": "boot/vmlinux",
       "add_network_config": true
     },
     "root_volume": {
-        "id": "root",
+      "id": "root",
+      "is_read_only": false,
+      "source": {
+        "container_source": "ghcr.io/weaveworks-liquidmetal/capmvm-k8s-os:1.23.5"
+      }
+    },
+    "additional_volumes": [
+      {
+        "id": "modules",
         "is_read_only": false,
         "source": {
-          "container_source": "ghcr.io/weaveworks/capmvm-kubernetes:1.21.8"
-        }
-      },
+          "container_source": "ghcr.io/weaveworks-liquidmetal/kernel-modules:5.10.77"
+        },
+        "mount_point": "/lib/modules/5.10.77"
+      }
+    ],
     "interfaces": [
       {
         "device_id": "eth1",

go.mod

@@ -6,8 +6,8 @@ require (
 	github.com/onsi/ginkgo/v2 v2.4.0
 	github.com/urfave/cli/v2 v2.10.2
 	github.com/warehouse-13/safety v0.0.0-20230120170710-60c7451457c5
-	github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20221117153111-bd29de31356f
-	github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20220722132608-982d429ba641
+	github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20230113160655-b1354ef6d578
+	github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20230113160655-b1354ef6d578
 	google.golang.org/grpc v1.51.0
 	google.golang.org/protobuf v1.28.1
 	gopkg.in/yaml.v2 v2.4.0

go.sum

@@ -249,8 +249,12 @@ github.com/warehouse-13/safety v0.0.0-20230120170710-60c7451457c5 h1:1uTkby9abQ0
 github.com/warehouse-13/safety v0.0.0-20230120170710-60c7451457c5/go.mod h1:hTlI1j1CXNEYrNoGbw7bAPj1/maOkuvGgoi63donJ5I=
 github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20221117153111-bd29de31356f h1:xHtKo4eiR1pRZUrXxlGF3KDuoa6xYjBGuPP47M9eVWM=
 github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20221117153111-bd29de31356f/go.mod h1:JPML9O56MoPKGX97jfj++BtuFFS84jm4T+jWQBjO5Uc=
+github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20230113160655-b1354ef6d578 h1:6LaBzWSOaaFI3fJ1oDDlfnlAmtPisrslVF+ZnmSKxr0=
+github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20230113160655-b1354ef6d578/go.mod h1:JPML9O56MoPKGX97jfj++BtuFFS84jm4T+jWQBjO5Uc=
 github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20220722132608-982d429ba641 h1:c5GlWX7UuBOQwx3Xfw4Jnd3VCHvChpkWaSVJhEbQcdo=
 github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20220722132608-982d429ba641/go.mod h1:d65mpsT+pbMnMJZhUqeNtt7lcQnsX8cowl9dTRkniSI=
+github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20230113160655-b1354ef6d578 h1:mBms3Efnv+YVbfMxN7/rHGveua8oteJwWreYfeYYTRE=
+github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20230113160655-b1354ef6d578/go.mod h1:d65mpsT+pbMnMJZhUqeNtt7lcQnsX8cowl9dTRkniSI=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

pkg/defaults/defaults.go

@@ -17,9 +17,14 @@ const (
 
 const (
 	// KernelImage is the default MVM kernel image.
-	KernelImage = "ghcr.io/weaveworks/flintlock-kernel:5.10.77"
-	// CloudImage is the default MVM cloud image.
-	CloudImage = "ghcr.io/weaveworks/capmvm-kubernetes:1.21.8"
+	KernelImage = "ghcr.io/weaveworks-liquidmetal/kernel-bin:5.10.77"
+	// ModulesImage is the default MVM kernel image.
+	ModulesImage = "ghcr.io/weaveworks-liquidmetal/kernel-modules:5.10.77"
+	// OSImage is the default MVM OS image.
+	OSImage = "ghcr.io/weaveworks-liquidmetal/capmvm-k8s-os:1.23.5"
+
+	kernelFilename = "boot/vmlinux"
+	modulesPath    = "/lib/modules/5.10.77"
 )
 
 func BaseMicroVM() *types.MicroVMSpec {
@@ -28,14 +33,24 @@ func BaseMicroVM() *types.MicroVMSpec {
 		MemoryInMb: 2048, //nolint: gomnd // we don't care
 		Kernel: &types.Kernel{
 			Image:            KernelImage,
-			Filename:         pointer.String("boot/vmlinux"),
+			Filename:         pointer.String(kernelFilename),
 			AddNetworkConfig: true,
 		},
 		RootVolume: &types.Volume{
 			Id:         "root",
 			IsReadOnly: false,
 			Source: &types.VolumeSource{
-				ContainerSource: pointer.String(CloudImage),
+				ContainerSource: pointer.String(OSImage),
+			},
+		},
+		AdditionalVolumes: []*types.Volume{
+			{
+				Id:         "modules",
+				IsReadOnly: false,
+				Source: &types.VolumeSource{
+					ContainerSource: pointer.String(ModulesImage),
+				},
+				MountPoint: pointer.String(modulesPath),
 			},
 		},
 		Interfaces: []*types.NetworkInterface{