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.59] more backports #2032

Merged
merged 4 commits into from
May 31, 2024
Merged

Conversation

Luap99
Copy link
Member

@Luap99 Luap99 commented May 31, 2024

Backports of #2021, #2020, #2027 and #2029

All valid bug fixes and as we need a new release anyway might as well pick them all up and not let users wait for no reason

Luap99 and others added 3 commits May 31, 2024 15:18
nftables was implemented for netavark v1.10

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
For some unknown reason the podman container image sets the
_CONTAINERS_USERNS_CONFIGURED env to an empty value. I don't know what
the purpose of this is but is will trigger the check here which is wrong
when the container is privileged.

To fix this check that the value is set to done like it is by the reexec
logic. Also make sure the lock dir uses the same condition to stay
consistent.

Fixes containers/podman#22791

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
When asked to add all of the entries from one index to another, don't
forget to carry over the artifactType.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
@Luap99
Copy link
Member Author

Luap99 commented May 31, 2024

@mheon @nalind PTAL

@mheon
Copy link
Member

mheon commented May 31, 2024

LGTM

The path no longer included the path separator between the env and our
config dir. The regression was added in commit 6c651df.

Fixes containers#2025

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
@Luap99
Copy link
Member Author

Luap99 commented May 31, 2024

added another one as for some reason the bot didn't do a PR for #2027

@nalind
Copy link
Member

nalind commented May 31, 2024

LGTM

Copy link
Member

@lsm5 lsm5 left a comment

Choose a reason for hiding this comment

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

/lgtm

Copy link
Contributor

openshift-ci bot commented May 31, 2024

[APPROVALNOTIFIER] This PR is APPROVED

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

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-merge-bot openshift-merge-bot bot merged commit 93caf83 into containers:v0.59 May 31, 2024
10 checks passed
@Luap99 Luap99 deleted the v0.59-backports branch May 31, 2024 17:53
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.

4 participants