Skip to content
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

Add systemd cgroup support for k3s and k8s #917

Merged
merged 1 commit into from
Mar 8, 2025

Conversation

z63d
Copy link
Contributor

@z63d z63d commented Mar 7, 2025

Taking over this PR: #875

@@ -6,6 +6,8 @@ cp -f /var/lib/rancher/k3s/agent/etc/containerd/config.toml /var/lib/rancher/k3s
cat <<EOF >> /var/lib/rancher/k3s/agent/etc/containerd/config.toml.tmpl
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.wasm]
runtime_type = "$PWD/dist/bin/containerd-shim-$1-v1"
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.wasm.options]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question: why is k3s using runtmie while k8s uses cri?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aha, that's the part I was missing

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

Copy link
Collaborator

@jprendes jprendes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Assuming CI passes, LGTM!

@jprendes jprendes merged commit 949fd29 into containerd:main Mar 8, 2025
77 checks passed
@z63d z63d deleted the feat/systemd-cgroup-support branch March 8, 2025 00:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants