diff --git a/go.mod b/go.mod index ab7c36e..c1fc60d 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,6 @@ go 1.22 require ( github.com/moby/moby v27.1.1+incompatible github.com/urfave/cli/v2 v2.27.2 - github.com/weaveworks/flintlock/api v0.0.0-20220304105853-8fcb8aa2bafb - github.com/weaveworks/flintlock/client v0.0.0-20220304105853-8fcb8aa2bafb github.com/yitsushi/macpot v1.0.3 go.uber.org/zap v1.27.0 google.golang.org/grpc v1.65.0 @@ -15,13 +13,15 @@ require ( require ( github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.6.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect + github.com/liquidmetal-dev/flintlock/api v0.0.0-20241227150005-3cc8809bcb11 // indirect + github.com/liquidmetal-dev/flintlock/client v0.0.0-20241227150005-3cc8809bcb11 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect go.uber.org/multierr v1.10.0 // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect - google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac // 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/protobuf v1.34.1 // indirect ) diff --git a/go.sum b/go.sum index b16ce75..a74a2e9 100644 --- a/go.sum +++ b/go.sum @@ -124,6 +124,8 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.6.0 h1:rgxjzoDmDXw5q8HONgyHhBas4to0/XWRo/gPpJhsUNQ= github.com/grpc-ecosystem/grpc-gateway/v2 v2.6.0/go.mod h1:qrJPVzv9YlhsrxJc3P/Q85nr0w1lIRikTl4JlhdDH5w= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= @@ -136,6 +138,10 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= 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.1.1+incompatible h1:WdCIKJ4WIxhrKti5c+Z7sj2SLADbsuB/reEBpQ4rtOQ= github.com/moby/moby v27.1.1+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -244,6 +250,8 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -289,6 +297,8 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -298,6 +308,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -401,6 +413,8 @@ google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac h1:qSNTkEN+L2mvWcLgJOR+8bdHX9rN/IdU3A1Ghpfb1Rg= google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= diff --git a/internal/cmd/microvm/create.go b/internal/cmd/microvm/create.go index 6bfbd2c..ab76621 100644 --- a/internal/cmd/microvm/create.go +++ b/internal/cmd/microvm/create.go @@ -14,9 +14,9 @@ const ( defaultNamespace = "default" defaultVCPU = 2 defaultMemoryMb = 2048 - defaultKernelImage = "ghcr.io/weaveworks/flintlock-kernel:5.10.77" - defaultKernelFile = "boot/vmlinux" - defaultRootImage = "ghcr.io/weaveworks/capmvm-kubernetes:1.21.8" + defaultKernelImage = "ghcr.io/liquidmetal-dev/firecracker-kernel-k8s:6.1" + defaultKernelFile = "vmlinux" + defaultRootImage = "ghcr.io/liquidmetal-dev/ubuntu:22.04" ) func newCreateCommand() *cli.Command { diff --git a/pkg/app/app.go b/pkg/app/app.go index 3187605..0f5f7e8 100644 --- a/pkg/app/app.go +++ b/pkg/app/app.go @@ -8,7 +8,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - flintlockv1 "github.com/weaveworks/flintlock/api/services/microvm/v1alpha1" + flintlockv1 "github.com/liquidmetal-dev/flintlock/api/services/microvm/v1alpha1" ) type App interface { diff --git a/pkg/app/create.go b/pkg/app/create.go index 9788ca7..51738e6 100644 --- a/pkg/app/create.go +++ b/pkg/app/create.go @@ -11,9 +11,9 @@ import ( "github.com/yitsushi/macpot" "gopkg.in/yaml.v2" - flintlockv1 "github.com/weaveworks/flintlock/api/services/microvm/v1alpha1" - flintlocktypes "github.com/weaveworks/flintlock/api/types" - "github.com/weaveworks/flintlock/client/cloudinit/userdata" + flintlockv1 "github.com/liquidmetal-dev/flintlock/api/services/microvm/v1alpha1" + flintlocktypes "github.com/liquidmetal-dev/flintlock/api/types" + "github.com/liquidmetal-dev/flintlock/client/cloudinit/userdata" ) func (a *app) Create(ctx context.Context, input *CreateInput) error { @@ -65,6 +65,7 @@ func (a *app) addUserdata(spec *flintlocktypes.MicroVMSpec, input *CreateInput) // TODO: this whole thing needs rewriting func (a *app) convertCreateInputToReq(input *CreateInput) (*flintlocktypes.MicroVMSpec, error) { + rootMountPoint := "/" req := &flintlocktypes.MicroVMSpec{ Id: input.Name, Namespace: input.Namespace, @@ -82,7 +83,7 @@ func (a *app) convertCreateInputToReq(input *CreateInput) (*flintlocktypes.Micro RootVolume: &flintlocktypes.Volume{ Id: "root", IsReadOnly: false, - MountPoint: "/", + MountPoint: &rootMountPoint, Source: &flintlocktypes.VolumeSource{ ContainerSource: &input.RootImage, }, @@ -176,7 +177,7 @@ func (a *app) convertCreateInputToReq(input *CreateInput) (*flintlocktypes.Micro apiVolume := &flintlocktypes.Volume{ Id: volParts[0], IsReadOnly: false, - MountPoint: volParts[2], + MountPoint: &volParts[2], Source: &flintlocktypes.VolumeSource{ ContainerSource: &volParts[1], }, diff --git a/pkg/app/delete.go b/pkg/app/delete.go index 4ad0f30..f2ad774 100644 --- a/pkg/app/delete.go +++ b/pkg/app/delete.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - flintlockv1 "github.com/weaveworks/flintlock/api/services/microvm/v1alpha1" + flintlockv1 "github.com/liquidmetal-dev/flintlock/api/services/microvm/v1alpha1" ) func (a *app) Delete(ctx context.Context, input *DeleteInput) error { diff --git a/pkg/app/get.go b/pkg/app/get.go index 1a62d68..744a845 100644 --- a/pkg/app/get.go +++ b/pkg/app/get.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - flintlockv1 "github.com/weaveworks/flintlock/api/services/microvm/v1alpha1" + flintlockv1 "github.com/liquidmetal-dev/flintlock/api/services/microvm/v1alpha1" "gopkg.in/yaml.v2" )