-
Notifications
You must be signed in to change notification settings - Fork 22
Update the containerd-shim-wasm to v1.0 #299
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, left a few nits
1e6050c
to
88df5c0
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
Great work @Mossaka !
88df5c0
to
402d9a6
Compare
Signed-off-by: Jiaxiao (mossaka) Zhou <[email protected]>
5b80069
to
2dd59d7
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you @Mossaka
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
On my machine K3S generated # k3s -v
k3s version v1.32.2+k3s1 (381620ef)
go version go1.23.6
# ls /var/lib/rancher/k3s/agent/etc/containerd/
certs.d config.toml
# cat /var/lib/rancher/k3s/agent/etc/containerd/config.toml
# irrelevant skipped...
[plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.'spin']
runtime_type = "io.containerd.spin.v2"
[plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.'spin'.options]
BinaryName = "/opt/kwasm/bin/containerd-shim-spin-v2"
SystemdCgroup = true All runtimes K3S found will share a global In templates: https://github.com/k3s-io/k3s/blob/441a42e8ce5a850e32546593ecad750a7ccc3ab1/pkg/agent/templates/templates.go#L25 Also see https://github.com/k3s-io/k3s/blob/441a42e8ce5a850e32546593ecad750a7ccc3ab1/pkg/agent/containerd/config_linux.go#L88 where this value is from |
@kate-goldenring So I found the problem in #299 (comment) might be
requiring To totally avoid such bug we might need something like jq but for toml |
… different quoting styles for spin Signed-off-by: Jiaxiao (mossaka) Zhou <[email protected]>
Signed-off-by: Jiaxiao (mossaka) Zhou <[email protected]>
Okay the CI's passing now! I did push two commits to fix it: Please take a look, @kate-goldenring and @jprendes Thank you for helping, @shirok1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@@ -66,7 +66,7 @@ cp /assets/containerd-shim-spin-v2 $NODE_ROOT$KWASM_DIR/bin/ | |||
# A bug in containerd makes BinaryName not work with shim not in PATH, so this statically links the kwasm installation to path | |||
# https://github.com/containerd/containerd/issues/11480 | |||
mkdir -p $NODE_ROOT/usr/local/bin/ | |||
ln -s $KWASM_DIR/bin/containerd-shim-spin-v2 $NODE_ROOT/usr/local/bin/containerd-shim-spin |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How did this ever work? Or is this change not released yet?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not released yet but I am not sure how the CI was not able to detect it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh wait, the CI was skipped for this change - I don't know why though: https://github.com/spinframework/containerd-shim-spin/actions/runs/14123812940. But this explains why this error went undetected to the main tree
Signed-off-by: Jiaxiao (mossaka) Zhou <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Thanks @Mossaka !
Preparing for the upcoming runwasi
v1.0
releaseSigned-off-by: Jiaxiao (mossaka) Zhou [email protected]