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

[0.14] Ensure that rootless cgroupsv1 will select cgroupfs #235

Merged
merged 3 commits into from
Jul 22, 2020

Conversation

vrothberg
Copy link
Member

The current logic is that, if Podman was built with the systemd
build flag, we will always select systemd cgroups by default.
Then, if we detect no systemd dbus session, we will swap to
cgroupfs. Problem: there are cases where a systemd dbus session
is available, but systemd cgroups don't work - most notably,
rootless mode on cgroups v1 systems. Special-case this so that we
will not try to force systemd mode and break rootless containers.

Fixes containers/podman#6982

Cherry-picked commit a61c5e2.

Signed-off-by: Matthew Heon matthew.heon@pm.me
Signed-off-by: Valentin Rothberg rothberg@redhat.com

The current logic is that, if Podman was built with the systemd
build flag, we will always select systemd cgroups by default.
Then, if we detect no systemd dbus session, we will swap to
cgroupfs. Problem: there are cases where a systemd dbus session
is available, but systemd cgroups don't work - most notably,
rootless mode on cgroups v1 systems. Special-case this so that we
will not try to force systemd mode and break rootless containers.

Fixes containers/podman#6982

Cherry-picked commit a61c5e2.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: vrothberg
To complete the pull request process, please assign
You can assign the PR to them by writing /assign in a comment when ready.

The full list of commands accepted by this bot can be found 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

@vrothberg
Copy link
Member Author

@rhatdan @mheon PTAL

Once merged, we need to cut a new 0.14...actually let me put that into this PR as well

* Ensure that rootless cgroupsv1 will select cgroupfs

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
@vrothberg
Copy link
Member Author

Now, the PR includes commits to bump the version. Once merged we can cut the release and get it into Podman's 2.0 branch.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
@vrothberg vrothberg force-pushed the 0.14-rootless-systemd branch from a425a79 to 0c43914 Compare July 22, 2020 10:49
@rhatdan
Copy link
Member

rhatdan commented Jul 22, 2020

LGTM

@rhatdan
Copy link
Member

rhatdan commented Jul 22, 2020

@mheon PTAL

@mheon
Copy link
Member

mheon commented Jul 22, 2020

LGTM, thanks @vrothberg

@mheon
Copy link
Member

mheon commented Jul 22, 2020

I think this is still manual merge land, so I'm pressing the button. @rhatdan can you spin a fresh release of 0.14 so we can vendor into Podman 2.0?

@mheon mheon merged commit e4f58a7 into containers:v0.14 Jul 22, 2020
@rhatdan
Copy link
Member

rhatdan commented Jul 22, 2020

@mheon Released.

@mheon
Copy link
Member

mheon commented Jul 22, 2020

Excellent, thanks.

M1cha pushed a commit to M1cha/common that referenced this pull request Dec 20, 2022
…cvlan

core,macvlan: add `gateway` from spec as default route to `macvlan` interface
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.

4 participants