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

[v0.57 backport] containers.conf: add crun-vm as a runtime #1930

Merged
merged 2 commits into from
Apr 5, 2024

Conversation

lsm5
Copy link
Member

@lsm5 lsm5 commented Mar 22, 2024

This is required for podman v4.9 to use crun-vm on F38/39.
(cherry picked from commit 7b056a0)

@rhatdan @TomSweeneyRedHat @Luap99 @mheon PTAL
cc @albertofaria

Signed-off-by: Lokesh Mandvekar <[email protected]>

This is required for podman v4.9 to use crun-vm on F38/39.
(cherry picked from commit 7b056a0)
Signed-off-by: Lokesh Mandvekar <[email protected]>
@@ -753,17 +753,17 @@ Indicates whether the application should be running in remote mode. This flag mo

Default OCI specific runtime in runtimes that will be used by default. Must
refer to a member of the runtimes table. Default runtime will be searched for
on the system using the priority: "crun", "runc", "kata".
on the system using the priority: "crun", "crun-vm", "runc", "kata".
Copy link
Member

Choose a reason for hiding this comment

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

I don't think crun-vm should ever be used as a default runtime, as it requires very particular containers and doesn't run them the way other runtimes would.

Copy link
Member Author

Choose a reason for hiding this comment

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

Shouldn't be an issue as people should be able to edit defaults in containers.conf. And I imagine unless crun-vm is installed, this issue also won't occur to begin with. @rhatdan wdyt?

Copy link
Member

Choose a reason for hiding this comment

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

runc should have priority over crun-vm, but I agree that we should not be defaulting to crun-vm.

Copy link
Member Author

Choose a reason for hiding this comment

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

in that case, we need to close this one, make these changes on main and then cherrypick to v0.57.

And if I'm reading default.go file correctly, crun-wasm also currently has priority over runc. Should that be changed as well while we're at it?

Copy link
Member Author

Choose a reason for hiding this comment

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

PTAL #1941 . If that looks ok, I'll add the commit here too.

Signed-off-by: Lokesh Mandvekar <[email protected]>
(cherry picked from commit de2ac28)
Signed-off-by: Lokesh Mandvekar <[email protected]>
@lsm5
Copy link
Member Author

lsm5 commented Apr 2, 2024

PTAL now. Included cherrypick of #1941

@rhatdan
Copy link
Member

rhatdan commented Apr 2, 2024

/approve
/lgtm

Copy link
Contributor

openshift-ci bot commented Apr 2, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lsm5, rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved label Apr 2, 2024
@rhatdan rhatdan merged commit 74908d8 into containers:v0.57 Apr 5, 2024
5 checks passed
@lsm5 lsm5 deleted the v0.57-crun-vm-backport branch July 11, 2024 19:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants