diff --git a/README.md b/README.md index 216efc3c..097fed7c 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ The table below shows you which versions of Firecracker are compatible with Flin | Flintlock | Firecracker | Cloud Hypervisor | | ----------------- | -------------------------------- | ----------------- | -| v0.7.0 | Official v1.0+ | v26.0 | +| v0.7.0 | Official v1.10+ | v41.0 | | v0.6.0 | Official v1.0+ or v1.0.0-macvtap | v26.0 | | v0.5.0 | Official v1.0+ or v1.0.0-macvtap | v26.0 | | v0.4.0 | Official v1.0+ or v1.0.0-macvtap | **Not Supported** | diff --git a/cmd/flintlockd/devbox.json b/cmd/flintlockd/devbox.json new file mode 100644 index 00000000..55f54d83 --- /dev/null +++ b/cmd/flintlockd/devbox.json @@ -0,0 +1,14 @@ +{ + "$schema": "https://raw.githubusercontent.com/jetify-com/devbox/0.12.0/.schema/devbox.schema.json", + "packages": ["go@1.22"], + "shell": { + "init_hook": [ + "echo 'Welcome to devbox!' > /dev/null" + ], + "scripts": { + "test": [ + "echo \"Error: no test specified\" && exit 1" + ] + } + } +} diff --git a/cmd/flintlockd/devbox.lock b/cmd/flintlockd/devbox.lock new file mode 100644 index 00000000..250842a9 --- /dev/null +++ b/cmd/flintlockd/devbox.lock @@ -0,0 +1,53 @@ +{ + "lockfile_version": "1", + "packages": { + "go@1.22": { + "last_modified": "2024-09-10T15:01:03Z", + "resolved": "github:NixOS/nixpkgs/5ed627539ac84809c78b2dd6d26a5cebeb5ae269#go", + "source": "devbox-search", + "version": "1.22.7", + "systems": { + "aarch64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/rfcwglhhspqx5v5h0sl4b3py14i6vpxa-go-1.22.7", + "default": true + } + ], + "store_path": "/nix/store/rfcwglhhspqx5v5h0sl4b3py14i6vpxa-go-1.22.7" + }, + "aarch64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/64z59pb0ss407rbv1fcvq0ynngrwfa6k-go-1.22.7", + "default": true + } + ], + "store_path": "/nix/store/64z59pb0ss407rbv1fcvq0ynngrwfa6k-go-1.22.7" + }, + "x86_64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/r8199g59rmp6ac0lnx86fpk57fbxc3bk-go-1.22.7", + "default": true + } + ], + "store_path": "/nix/store/r8199g59rmp6ac0lnx86fpk57fbxc3bk-go-1.22.7" + }, + "x86_64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/chzgk756zb2cqlzbjr86m0lfxi63cdfy-go-1.22.7", + "default": true + } + ], + "store_path": "/nix/store/chzgk756zb2cqlzbjr86m0lfxi63cdfy-go-1.22.7" + } + } + } + } +} diff --git a/core/application/reconcile.go b/core/application/reconcile.go index 8ebfe094..df8bb940 100644 --- a/core/application/reconcile.go +++ b/core/application/reconcile.go @@ -81,7 +81,9 @@ func (a *app) reschedule(ctx context.Context, logger *logrus.Entry, spec *models context.Background(), defaults.TopicMicroVMEvents, &events.MicroVMSpecUpdated{ - UID: uid, + UID: uid, + Namespace: spec.ID.Namespace(), + ID: spec.ID.Name(), }, ) if err != nil { diff --git a/docs/image-creation.md b/docs/image-creation.md index b48d7b79..9432e1ef 100644 --- a/docs/image-creation.md +++ b/docs/image-creation.md @@ -2,4 +2,4 @@ This doc has been superseded by the [published docs][site]. -[site]: https://weaveworks-liquidmetal.github.io/flintlock/docs/guides/images +[site]: https://flintlock.liquidmetal.dev/docs/guides/images/ diff --git a/pkg/defaults/defaults.go b/pkg/defaults/defaults.go index a9b50760..834e68b3 100644 --- a/pkg/defaults/defaults.go +++ b/pkg/defaults/defaults.go @@ -6,7 +6,7 @@ import ( const ( // Domain is the reverse order domain name to use. - Domain = "works.weave.flintlockd" + Domain = "dev.liquidmetal.flintlockd" // ContainerdNamespace is the name of the namespace to use with containerd. ContainerdNamespace = "flintlock" diff --git a/userdocs/docs/guides/images.md b/userdocs/docs/guides/images.md index 22ee53f1..1dc76786 100644 --- a/userdocs/docs/guides/images.md +++ b/userdocs/docs/guides/images.md @@ -2,6 +2,8 @@ title: MicroVM images --- +> NOTE: this page is currently out of date and will be updated soon. + MicroVMs receive kernel binaries and Operating System volumes from container images. This means that users can easily create and publish their own on Dockerhub. @@ -112,6 +114,6 @@ COPY vmlinux initrd-generic / 1. Use docker build and then push [image-builder]: https://github.com/liquidmetal-dev/image-builder -[lm]: https://weaveworks-liquidmetal.github.io/site/ +[lm]: https://liquidmetal.dev/ [db]: https://wiki.debian.org/Debootstrap [fc]: https://github.com/firecracker-microvm/firecracker/tree/main/resources/guest_configs