[v5.3] Some backports for 5.3 #24495
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add support for inspecting Mounts which include SubPaths. Handle SubPaths for kubernetes image volumes. Signed-off-by: Daniel J Walsh <[email protected]> (cherry picked from commit 6346a11) Signed-off-by: Paul Holzinger <[email protected]>
If volume ls was called while another volume was removed at the right time it could have failed with "no such volume" as we did not ignore such error during listing. As we list things and this no longer exists the correct thing is to ignore the error and continue like we do with containers, pods, etc... This was pretty easy to reproduce with these two commands running in different terminals: while :; do bin/podman volume create test && bin/podman volume rm test || break; done while :; do bin/podman volume ls || break ; done I have a slight feeling that this might solve containers#23913 but I am not to sure there so I am not adding a Fixes here. Signed-off-by: Paul Holzinger <[email protected]> (cherry picked from commit 9a0c0b2) Signed-off-by: Paul Holzinger <[email protected]>
Signed-off-by: Ed Santiago <[email protected]> (cherry picked from commit ba5ce49) Signed-off-by: Paul Holzinger <[email protected]>
This reverts commit d03e8ff. Signed-off-by: Ed Santiago <[email protected]> (cherry picked from commit d770069) Signed-off-by: Paul Holzinger <[email protected]>
Temporary, until we get CI VMs with kernel 6.11.6. I've lost track of where this is being discussed. This reverts commit 7f836df. Signed-off-by: Ed Santiago <[email protected]> (cherry picked from commit 0e66a79) Signed-off-by: Paul Holzinger <[email protected]>
Signed-off-by: Paul Holzinger <[email protected]> (cherry picked from commit f6af35c) Signed-off-by: Paul Holzinger <[email protected]>
Regression test for containers#23550. Setting the TZDIR env should make no difference for the local timezone as this is not a real timezone name that is resolved from that directory. Signed-off-by: Paul Holzinger <[email protected]> (cherry picked from commit fb3a0e9) Signed-off-by: Paul Holzinger <[email protected]>
Added in containers/buildah#5783 Signed-off-by: Paul Holzinger <[email protected]> (cherry picked from commit 22152a2) Signed-off-by: Paul Holzinger <[email protected]>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: 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 |
openshift-ci
bot
added
the
approved
github-actions
bot
added
the
kind/api-change
|
@mheon PTAL, this should make the 5.3 branch ready for the final vendor + two other small fixes |
|
/lgtm |
openshift-merge-bot
bot
merged commit d88d04e
into
containers:v5.3
82 of 84 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backports of
#24473
#24479
#24485
#24447
We will need the new CI images for the vendor part. This is also not the final vendor but at least we will know that the recent main vendor passes CI on the 5.3 branch.
Does this PR introduce a user-facing change?