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.

Sign up for GitHub

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

Jump to bottom

libpod/config: default: use crun on Cgroups v2 #4470

Merged
merged 1 commit into from
Nov 7, 2019
Merged

libpod/config: default: use crun on Cgroups v2 #4470

merged 1 commit into from
Nov 7, 2019

Conversation

vrothberg
Copy link
Member

When running on a node with Cgroups v2, default to using crun instead
of runc. Note that this only impacts the hard-coded default config.
No user config will be over-written.

Fixes: #4463
Signed-off-by: Valentin Rothberg [email protected]

@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S labels Nov 7, 2019
@vrothberg vrothberg mentioned this pull request Nov 7, 2019
Closed
giuseppe
giuseppe approved these changes Nov 7, 2019
View reviewed changes
Copy link
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

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

LGTM

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe, vrothberg

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

TomSweeneyRedHat
TomSweeneyRedHat reviewed Nov 7, 2019
View reviewed changes
libpod/config/default.go
"crun": {
"/usr/bin/crun",
"/usr/local/bin/crun",
},
Copy link
Member

Choose a reason for hiding this comment

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

just wondering if we should increase the number of locations here to be similar to runc's list above it. I'm mostly concerned about other platforms such as ubuntu. @lsm5 any opinions?

Copy link
Member Author

Choose a reason for hiding this comment

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

Good question. I copied those entries from the main libpod.conf so it should work fine on Fedora. I don't know where other distros put crun.

Copy link
Member

Choose a reason for hiding this comment

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

Lets just put in the same paths for runc, for crun.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done. I also added them to the libpod.conf.

@vrothberg
libpod/config: default: use crun on Cgroups v2
709ad91 
When running on a node with Cgroups v2, default to using `crun` instead
of `runc`.  Note that this only impacts the hard-coded default config.
No user config will be over-written.

Fixes: containers#4463
Signed-off-by: Valentin Rothberg <[email protected]>
TomSweeneyRedHat
TomSweeneyRedHat reviewed Nov 7, 2019
View reviewed changes
Copy link
Member

@TomSweeneyRedHat TomSweeneyRedHat left a comment

Choose a reason for hiding this comment

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

LGTM

@rhatdan
Copy link
Member

rhatdan commented Nov 7, 2019

/lgtm
/hold
hold cancel when tests pass.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 7, 2019
@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 7, 2019
@mheon
Copy link
Member

mheon commented Nov 7, 2019

LGTM

@vrothberg
Copy link
Member Author

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 7, 2019
@edsantiago
Copy link
Member

/lgtm

Thank you for your quick work. There should be a rawhide autobuild soon after this commit, I'll update this PR with gating test results.

@openshift-merge-robot openshift-merge-robot merged commit 24efb5e into containers:master Nov 7, 2019
@edsantiago
Copy link
Member

Update: Success.

There's no actual bodhi email nor IRC message yet, but that happens sometimes. What's important is that the gating tests passed on the 24efb5e build.

Thanks again for addressing this so quickly.

@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 26, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 26, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@TomSweeneyRedHat TomSweeneyRedHat TomSweeneyRedHat left review comments

@giuseppe giuseppe giuseppe approved these changes

@rhatdan rhatdan Awaiting requested review from rhatdan

@umohnani8 umohnani8 Awaiting requested review from umohnani8

Assignees

@edsantiago edsantiago

@rhatdan rhatdan

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

rawhide, rootless: podman is defaulting to runc (and failing)
8 participants
@vrothberg @openshift-ci-robot @rhatdan @mheon @edsantiago @giuseppe @TomSweeneyRedHat @openshift-merge-robot