Skip to content

Commit 19f9906

Browse files
authored
chore: changes after testing new releases (#959)
Signed-off-by: Richard Case <richard.case@outlook.com>
1 parent dacaf44 commit 19f9906

File tree

7 files changed

+76
-5
lines changed

7 files changed

+76
-5
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ The table below shows you which versions of Firecracker are compatible with Flin
5656

5757
| Flintlock | Firecracker | Cloud Hypervisor |
5858
| ----------------- | -------------------------------- | ----------------- |
59-
| v0.7.0 | Official v1.0+ | v26.0 |
59+
| v0.7.0 | Official v1.10+ | v41.0 |
6060
| v0.6.0 | Official v1.0+ or v1.0.0-macvtap | v26.0 |
6161
| v0.5.0 | Official v1.0+ or v1.0.0-macvtap | v26.0 |
6262
| v0.4.0 | Official v1.0+ or v1.0.0-macvtap | **Not Supported** |

cmd/flintlockd/devbox.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/jetify-com/devbox/0.12.0/.schema/devbox.schema.json",
3+
"packages": ["go@1.22"],
4+
"shell": {
5+
"init_hook": [
6+
"echo 'Welcome to devbox!' > /dev/null"
7+
],
8+
"scripts": {
9+
"test": [
10+
"echo \"Error: no test specified\" && exit 1"
11+
]
12+
}
13+
}
14+
}

cmd/flintlockd/devbox.lock

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
{
2+
"lockfile_version": "1",
3+
"packages": {
4+
"go@1.22": {
5+
"last_modified": "2024-09-10T15:01:03Z",
6+
"resolved": "github:NixOS/nixpkgs/5ed627539ac84809c78b2dd6d26a5cebeb5ae269#go",
7+
"source": "devbox-search",
8+
"version": "1.22.7",
9+
"systems": {
10+
"aarch64-darwin": {
11+
"outputs": [
12+
{
13+
"name": "out",
14+
"path": "/nix/store/rfcwglhhspqx5v5h0sl4b3py14i6vpxa-go-1.22.7",
15+
"default": true
16+
}
17+
],
18+
"store_path": "/nix/store/rfcwglhhspqx5v5h0sl4b3py14i6vpxa-go-1.22.7"
19+
},
20+
"aarch64-linux": {
21+
"outputs": [
22+
{
23+
"name": "out",
24+
"path": "/nix/store/64z59pb0ss407rbv1fcvq0ynngrwfa6k-go-1.22.7",
25+
"default": true
26+
}
27+
],
28+
"store_path": "/nix/store/64z59pb0ss407rbv1fcvq0ynngrwfa6k-go-1.22.7"
29+
},
30+
"x86_64-darwin": {
31+
"outputs": [
32+
{
33+
"name": "out",
34+
"path": "/nix/store/r8199g59rmp6ac0lnx86fpk57fbxc3bk-go-1.22.7",
35+
"default": true
36+
}
37+
],
38+
"store_path": "/nix/store/r8199g59rmp6ac0lnx86fpk57fbxc3bk-go-1.22.7"
39+
},
40+
"x86_64-linux": {
41+
"outputs": [
42+
{
43+
"name": "out",
44+
"path": "/nix/store/chzgk756zb2cqlzbjr86m0lfxi63cdfy-go-1.22.7",
45+
"default": true
46+
}
47+
],
48+
"store_path": "/nix/store/chzgk756zb2cqlzbjr86m0lfxi63cdfy-go-1.22.7"
49+
}
50+
}
51+
}
52+
}
53+
}

core/application/reconcile.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ func (a *app) reschedule(ctx context.Context, logger *logrus.Entry, spec *models
8181
context.Background(),
8282
defaults.TopicMicroVMEvents,
8383
&events.MicroVMSpecUpdated{
84-
UID: uid,
84+
UID: uid,
85+
Namespace: spec.ID.Namespace(),
86+
ID: spec.ID.Name(),
8587
},
8688
)
8789
if err != nil {

docs/image-creation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
This doc has been superseded by the [published docs][site].
44

5-
[site]: https://weaveworks-liquidmetal.github.io/flintlock/docs/guides/images
5+
[site]: https://flintlock.liquidmetal.dev/docs/guides/images/

pkg/defaults/defaults.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
const (
88
// Domain is the reverse order domain name to use.
9-
Domain = "works.weave.flintlockd"
9+
Domain = "dev.liquidmetal.flintlockd"
1010

1111
// ContainerdNamespace is the name of the namespace to use with containerd.
1212
ContainerdNamespace = "flintlock"

userdocs/docs/guides/images.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
title: MicroVM images
33
---
44

5+
> NOTE: this page is currently out of date and will be updated soon.
6+
57
MicroVMs receive kernel binaries and Operating System volumes from container images.
68
This means that users can easily create and publish their own on Dockerhub.
79

@@ -112,6 +114,6 @@ COPY vmlinux initrd-generic /
112114
1. Use docker build and then push
113115

114116
[image-builder]: https://github.com/liquidmetal-dev/image-builder
115-
[lm]: https://weaveworks-liquidmetal.github.io/site/
117+
[lm]: https://liquidmetal.dev/
116118
[db]: https://wiki.debian.org/Debootstrap
117119
[fc]: https://github.com/firecracker-microvm/firecracker/tree/main/resources/guest_configs

0 commit comments

Comments
 (0)