[v4.0] Backport handling of incompatible machines #13560
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
* Enable support of virtfs in Podman and darwin. At the time of this writing, it requires a special patch not yet included in upstream qemu. * Prefer to use a specially built qemu to support virtfs. The qemu is installed under libexec/podman. [NO NEW TESTS NEEDED] Signed-off-by: Brent Baude <[email protected]>
Signed-off-by: Jason T. Greene <[email protected]>
If you want to remove a running machine, you can now pass the --force/-f to podman machine rm and the machine will be stopped and removed without confirmations. Fixes: containers#13448 [NO NEW TESTS NEEDED] Signed-off-by: Brent Baude <[email protected]>
n1hility
force-pushed
the
backport-handle-incompatible
branch
from
0528938 to
b1884f0
Compare
|
Can we cherry-pick this, once set, to the v4.0-rhel branch too? |
Signed-off-by: Jason T. Greene <[email protected]>
Start in a reduced mode for recovery, warn, and provide instructions to recreate them Signed-off-by: Jason T. Greene <[email protected]>
n1hility
force-pushed
the
backport-handle-incompatible
branch
from
b1884f0 to
6878376
Compare
n1hility
changed the title
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: n1hility, 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 |
openshift-ci
bot
added
the
approved
|
We shouldn't be merging anything into this v4.0 branch or the v4.0-rhel branch for the next week or two..... |
github-actions
bot
added
the
locked - please file new issue/PR
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This backports the incompatible machine handling PR and 4 other dependent PRs (list below)
NOTE: That this treats all machines created by podman versions older than 4.0.2 + brew as incompatible and must be recreated (Not just 3.x). Since 4.0.0 and 4.0.1 were not released on MacOS, in practice this should not be observed. This is also technically the most correct since #13409 changes the uid of the machine uid to match the host user's uid, impacting compatibility of future 4.x releases that expect this to be the case (e.g. volume mounts using a 4.0.1 created machine won't match)
#13523 - Tolerate old machine (Fixes #13510)
#13562 - Fix type-o and cleanup doc punctuation (requested through review)
#13466 - machine rm -f (Fixes #13448)
#13465 - Improve install message (Fixes #13456)
#13409 - MacOS Improvements - introduces virtfs - shipped post 4.0.2 as a brew 4.0.2 patch
[NO NEW TESTS NEEDED]