[Backport release-1.27] Fix ocibundle for 32bit arm #4521
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
We may run k0s on arm/v8 but only have images for arm/v7. Use Only() instead of OnlyStrinct() to also match arm/v7 on arm/v8. Fixes commit 9dd47b4 (#1939 Fix airgap arm64 build. Strictly use target platform only) ref: https://pkg.go.dev/github.com/containerd/containerd/platforms#Only Signed-off-by: Natanael Copa <[email protected]> (cherry picked from commit 87d6609) (cherry picked from commit 999d637)
Signed-off-by: Jussi Nummelin <[email protected]> (cherry picked from commit 29c7544) (cherry picked from commit 39c8112)
Signed-off-by: Jussi Nummelin <[email protected]> (cherry picked from commit c2fb3e0) (cherry picked from commit 8f974a2)
Co-authored-by: Tom Wieczorek <[email protected]> Signed-off-by: Jussi Nummelin <[email protected]> (cherry picked from commit e53d0fc) (cherry picked from commit 775c14e)
So that the changes from commit 61a7c4999 can be used without bumping containerd to v1.7. Signed-off-by: Tom Wieczorek <[email protected]> (cherry picked from commit 0bfb9d1)
jnummelin
changed the title
twz123
approved these changes
May 31, 2024
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.
Automated backport to
release-1.27, triggered by a label in #4509.See .