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

[Release-1.27] Runtimes backport #9013

Merged
merged 2 commits into from Dec 9, 2023

Conversation

vitorsavian
Copy link
Contributor

Proposed Changes

  • Add support for wasm, nvidia and crun
  • A new flag for agent -> default-runtime that set the default runtime of containerd in config.toml
  • Refactor of some functions related to container runtimes

Types of Changes

Verification

RuntimeClasses
  • you will need to create just a server and see if the runtime classes using this command here
kubectl get runtimeclasses

Default runtime flag
  • you will need to create a agent with the default-runtime and have the runtime installed on the machine
k3s agent -s {server} -t {token} --default-runtime=crun
  • after you set the agent, you will need to see the info from containerd
k3s crictl info

Testing

Linked Issues

User-Facing Change

Added runtime classes for wasm/nvidia/crun
Added default runtime flag for containerd

Further Comments

With this PR we can set new runtimes as we please, just need to add the runtime function in the findContainerRuntimes

Create a generic helper function that finds extra containerd runtimes.
The code was originally inside of the nvidia container discovery file.

Signed-off-by: Flavio Castelli <fcastelli@suse.com>

Discover the containerd shims based on runwasi that are already
available on the node.

The runtimes could have been installed either by a package manager or by
the kwasm operator.

Signed-off-by: Flavio Castelli <fcastelli@suse.com>

The containerd configuration on a Linux system now handles the nvidia
and the WebAssembly runtimes.

Signed-off-by: Flavio Castelli <fcastelli@suse.com>

---------

Signed-off-by: Flavio Castelli <fcastelli@suse.com>

Added runtime classes for crun/wasm/nvidia

Signed-off-by: Vitor Savian <vitor.savian@suse.com>

Added default runtime flag

Signed-off-by: Vitor Savian <vitor.savian@suse.com>
@vitorsavian vitorsavian requested a review from a team as a code owner December 8, 2023 13:11
@vitorsavian vitorsavian force-pushed the runtimes-release-1.27 branch 2 times, most recently from 8a376f6 to 4b832e9 Compare December 8, 2023 13:27
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond brandond merged commit d01c57f into k3s-io:release-1.27 Dec 9, 2023
13 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants