Skip to content

Commit e7f583a

Browse files
richardcaserichardcase
authored
Merge pull request #27 from liquidmetal-dev/org_update
chore: updates after org move
2 parents 10fdf67 + 20fb98a commit e7f583a

File tree

7 files changed

+33
-18
lines changed

7 files changed

+33
-18
lines changed

‎go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ go 1.22
55
require (
66
github.com/moby/moby v27.1.1+incompatible
77
github.com/urfave/cli/v2 v2.27.2
8-
github.com/weaveworks/flintlock/api v0.0.0-20220304105853-8fcb8aa2bafb
9-
github.com/weaveworks/flintlock/client v0.0.0-20220304105853-8fcb8aa2bafb
108
github.com/yitsushi/macpot v1.0.3
119
go.uber.org/zap v1.27.0
1210
google.golang.org/grpc v1.65.0
@@ -15,13 +13,15 @@ require (
1513

1614
require (
1715
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
18-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.6.0 // indirect
16+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
17+
github.com/liquidmetal-dev/flintlock/api v0.0.0-20241227150005-3cc8809bcb11 // indirect
18+
github.com/liquidmetal-dev/flintlock/client v0.0.0-20241227150005-3cc8809bcb11 // indirect
1919
github.com/russross/blackfriday/v2 v2.1.0 // indirect
2020
github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
2121
go.uber.org/multierr v1.10.0 // indirect
22-
golang.org/x/net v0.25.0 // indirect
23-
golang.org/x/sys v0.20.0 // indirect
24-
golang.org/x/text v0.15.0 // indirect
25-
google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac // indirect
22+
golang.org/x/net v0.26.0 // indirect
23+
golang.org/x/sys v0.21.0 // indirect
24+
golang.org/x/text v0.16.0 // indirect
25+
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
2626
google.golang.org/protobuf v1.34.1 // indirect
2727
)

‎go.sum‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m
124124
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
125125
github.com/grpc-ecosystem/grpc-gateway/v2 v2.6.0 h1:rgxjzoDmDXw5q8HONgyHhBas4to0/XWRo/gPpJhsUNQ=
126126
github.com/grpc-ecosystem/grpc-gateway/v2 v2.6.0/go.mod h1:qrJPVzv9YlhsrxJc3P/Q85nr0w1lIRikTl4JlhdDH5w=
127+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0=
128+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k=
127129
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
128130
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
129131
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=
136138
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
137139
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
138140
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
141+
github.com/liquidmetal-dev/flintlock/api v0.0.0-20241227150005-3cc8809bcb11 h1:Aa29z3oh3SSAqs10mgvWmlVmB17XRNLO4p56vuap4gg=
142+
github.com/liquidmetal-dev/flintlock/api v0.0.0-20241227150005-3cc8809bcb11/go.mod h1:Qi6hJN8sd6OvEw6eNGiBR3EFaUbOJYUOCeQa6OeEQxU=
143+
github.com/liquidmetal-dev/flintlock/client v0.0.0-20241227150005-3cc8809bcb11 h1:2C6y1bwLlLjUOEP9+z72UUUddtWq4u4dTZl7CDALd7k=
144+
github.com/liquidmetal-dev/flintlock/client v0.0.0-20241227150005-3cc8809bcb11/go.mod h1:jOUkt2HCTDPa52jW7s1Jq4zGgRgGJO7scFGXMDrMX8M=
139145
github.com/moby/moby v27.1.1+incompatible h1:WdCIKJ4WIxhrKti5c+Z7sj2SLADbsuB/reEBpQ4rtOQ=
140146
github.com/moby/moby v27.1.1+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
141147
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
244250
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
245251
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
246252
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
253+
golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
254+
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
247255
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
248256
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
249257
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
289297
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
290298
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
291299
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
300+
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
301+
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
292302
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
293303
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
294304
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=
298308
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
299309
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
300310
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
311+
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
312+
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
301313
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
302314
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
303315
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
401413
google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
402414
google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac h1:qSNTkEN+L2mvWcLgJOR+8bdHX9rN/IdU3A1Ghpfb1Rg=
403415
google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
416+
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A=
417+
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
404418
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
405419
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
406420
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=

‎internal/cmd/microvm/create.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ const (
1414
defaultNamespace = "default"
1515
defaultVCPU = 2
1616
defaultMemoryMb = 2048
17-
defaultKernelImage = "ghcr.io/weaveworks/flintlock-kernel:5.10.77"
18-
defaultKernelFile = "boot/vmlinux"
19-
defaultRootImage = "ghcr.io/weaveworks/capmvm-kubernetes:1.21.8"
17+
defaultKernelImage = "ghcr.io/liquidmetal-dev/firecracker-kernel-k8s:6.1"
18+
defaultKernelFile = "vmlinux"
19+
defaultRootImage = "ghcr.io/liquidmetal-dev/ubuntu:22.04"
2020
)
2121

2222
func newCreateCommand() *cli.Command {

‎pkg/app/app.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"google.golang.org/grpc"
99
"google.golang.org/grpc/credentials/insecure"
1010

11-
flintlockv1 "github.com/weaveworks/flintlock/api/services/microvm/v1alpha1"
11+
flintlockv1 "github.com/liquidmetal-dev/flintlock/api/services/microvm/v1alpha1"
1212
)
1313

1414
type App interface {

‎pkg/app/create.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
"github.com/yitsushi/macpot"
1212
"gopkg.in/yaml.v2"
1313

14-
flintlockv1 "github.com/weaveworks/flintlock/api/services/microvm/v1alpha1"
15-
flintlocktypes "github.com/weaveworks/flintlock/api/types"
16-
"github.com/weaveworks/flintlock/client/cloudinit/userdata"
14+
flintlockv1 "github.com/liquidmetal-dev/flintlock/api/services/microvm/v1alpha1"
15+
flintlocktypes "github.com/liquidmetal-dev/flintlock/api/types"
16+
"github.com/liquidmetal-dev/flintlock/client/cloudinit/userdata"
1717
)
1818

1919
func (a *app) Create(ctx context.Context, input *CreateInput) error {
@@ -65,6 +65,7 @@ func (a *app) addUserdata(spec *flintlocktypes.MicroVMSpec, input *CreateInput)
6565

6666
// TODO: this whole thing needs rewriting
6767
func (a *app) convertCreateInputToReq(input *CreateInput) (*flintlocktypes.MicroVMSpec, error) {
68+
rootMountPoint := "/"
6869
req := &flintlocktypes.MicroVMSpec{
6970
Id: input.Name,
7071
Namespace: input.Namespace,
@@ -82,7 +83,7 @@ func (a *app) convertCreateInputToReq(input *CreateInput) (*flintlocktypes.Micro
8283
RootVolume: &flintlocktypes.Volume{
8384
Id: "root",
8485
IsReadOnly: false,
85-
MountPoint: "/",
86+
MountPoint: &rootMountPoint,
8687
Source: &flintlocktypes.VolumeSource{
8788
ContainerSource: &input.RootImage,
8889
},
@@ -176,7 +177,7 @@ func (a *app) convertCreateInputToReq(input *CreateInput) (*flintlocktypes.Micro
176177
apiVolume := &flintlocktypes.Volume{
177178
Id: volParts[0],
178179
IsReadOnly: false,
179-
MountPoint: volParts[2],
180+
MountPoint: &volParts[2],
180181
Source: &flintlocktypes.VolumeSource{
181182
ContainerSource: &volParts[1],
182183
},

‎pkg/app/delete.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"fmt"
66

7-
flintlockv1 "github.com/weaveworks/flintlock/api/services/microvm/v1alpha1"
7+
flintlockv1 "github.com/liquidmetal-dev/flintlock/api/services/microvm/v1alpha1"
88
)
99

1010
func (a *app) Delete(ctx context.Context, input *DeleteInput) error {

‎pkg/app/get.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"os"
77

8-
flintlockv1 "github.com/weaveworks/flintlock/api/services/microvm/v1alpha1"
8+
flintlockv1 "github.com/liquidmetal-dev/flintlock/api/services/microvm/v1alpha1"
99
"gopkg.in/yaml.v2"
1010
)
1111

0 commit comments

Comments
 (0)