Skip to content

Commit

Permalink
chore: changes after testing new releases (#959)
Browse files Browse the repository at this point in the history
Signed-off-by: Richard Case <[email protected]>
  • Loading branch information
richardcase authored Dec 17, 2024
1 parent dacaf44 commit 19f9906
Show file tree
Hide file tree
Showing 7 changed files with 76 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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** |
Expand Down
14 changes: 14 additions & 0 deletions cmd/flintlockd/devbox.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"$schema": "https://raw.githubusercontent.com/jetify-com/devbox/0.12.0/.schema/devbox.schema.json",
"packages": ["[email protected]"],
"shell": {
"init_hook": [
"echo 'Welcome to devbox!' > /dev/null"
],
"scripts": {
"test": [
"echo \"Error: no test specified\" && exit 1"
]
}
}
}
53 changes: 53 additions & 0 deletions cmd/flintlockd/devbox.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"lockfile_version": "1",
"packages": {
"[email protected]": {
"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"
}
}
}
}
}
4 changes: 3 additions & 1 deletion core/application/reconcile.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion docs/image-creation.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/
2 changes: 1 addition & 1 deletion pkg/defaults/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 3 additions & 1 deletion userdocs/docs/guides/images.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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

0 comments on commit 19f9906

Please sign in to comment.