Make blob reuse choices manifest-format-sensitive, and allow conversions when writing to format-agnostic transports #2213
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
|
LGTM |
mtrmac
force-pushed
the
zstd-blob-reuse-choice
branch
2 times, most recently
from
e0eaafa
to
e76fe04
Compare
mtrmac
changed the title
|
Now tested (with #2205 (comment) ), and I fixed some of the debug log data. Ready for review/merging. |
32 tasks
mtrmac
added
the
kind/bug
mtrmac
force-pushed
the
zstd-blob-reuse-choice
branch
2 times, most recently
from
37c4657
to
f7f0248
Compare
We might want to trigger a conversion to OCI if the source is not OCI, but the destination already contains a Zstd version of a layer. We can do that for destinations that express a restricted list of manifest formats, so it is unexpected that completely unrestricted destinations can't trigger a conversion, and just fail (right now), or perhaps don't fail but unnecessarily upload (in the future), in that case. Signed-off-by: Miloslav Trmač <[email protected]>
Should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]>
... to be a bit more similar to PutBlobOptions, to be consistent with the constructor, and to start with identification before parameters. Should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]>
We will need to access it from copyLayer. Should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]>
... to allow adding more conditions Should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]>
…BlobOptions ... because we will add more reasons to reject a match. Should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]>
There's no reason not to, and we will need it in other cases as well. Signed-off-by: Miloslav Trmač <[email protected]>
... and eliminate incorrectly named requiredCompression variables by using it. Should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]>
... so that we limit blob reuse to acceptable conversion formats, based on possible manifest formats. Implement it in CandidateMatchesTryReusingBlobOptions, covering all (in-tree) implementations. We still _try_ converting to schema2/schema1 (and upload the schema1 empty layer to the destination registry) before succeeding with OCI. Signed-off-by: Miloslav Trmač <[email protected]>
mtrmac
force-pushed
the
zstd-blob-reuse-choice
branch
from
f7f0248
to
8aadec3
Compare
|
@giuseppe PTAL |
|
@mtrmac can we merge it? |
atmosphere-ci bot
pushed a commit
to vexxhost/atmosphere
that referenced
this pull request
Apr 21, 2024
…1114) This PR contains the following updates: Package Change Age Adoption Passing Confidence github.com/containers/image/v5 v5.29.2 -> v5.30.0 WarningSome dependencies could not be looked up. Check the warning logs for more information. Release Notes containers/image (github.com/containers/image/v5) v5.30.0 Compare Source What's Changed A fair number of improvements when working with zstd and zstd:chunked-compressed images. Note that make install now installs policy.json and registries.d/default.yaml. Refuse compression to zstd when using schema1 by @mtrmac in containers/image#2196 Don't expose local account details in oci-archive tar files by @mtrmac in containers/image#2202 Trigger a conversion to OCI when compressing to Zstd by @mtrmac in containers/image#2204 Add buildtags to avoid fulcio and rekor dependencies by @siretart in containers/image#2180 copy: do not fail if digest mismatches by @giuseppe in containers/image#1980 Moving policy.json and default.yaml from containers/skopeo by @rahilarious in containers/image#2215 Embrace codespell: config, workflow (to alert when new typos added) and get typos fixed by @yarikoptic in containers/image#2214 Fix raspberry pi zero cpu variant recognition by @lstolcman in containers/image#2086 storage: validate images converted to zstd:chunked by @giuseppe in containers/image#2243 Make blob reuse choices manifest-format-sensitive, and allow conversions when writing to format-agnostic transports by @mtrmac in containers/image#2213 Edit the manifest when pushing uncompressed data from c/storage by @mtrmac in containers/image#2273 Random storage-related cleanups by @mtrmac in containers/image#2287 Improve storage transport documentation, primarily about locking by @mtrmac in containers/image#2291 Fix c/storage destination with partial pulls by @mtrmac in containers/image#2288 Fix manifest updates when we match a layer by TOC digest by @mtrmac in containers/image#2294 Cleanly fail when trying to obtain a DiffID of a non-OCI image by @mtrmac in containers/image#2295 Beautify TOC-related parts of storageImageSource by @mtrmac in containers/image#2296 storage: use the new ApplyStagedLayer interface by @giuseppe in containers/image#2301 Also annotate image instances using zstd:chunked as using zstd by @mtrmac in containers/image#2302 Support editing ArtifactType, preserve it in lists by @nalind in containers/image#2304 Provide data to correctly report throughput on partial pulls by @mtrmac in containers/image#2308 Add validation error to digesting reader by @saschagrunert in containers/image#2312 Fix handling of errors when fetching layers by URLs by @mtrmac in containers/image#2310 Improve handling of zstd vs. zstd:chunked matching by @mtrmac in containers/image#2317 New Contributors @rahilarious made their first contribution in containers/image#2215 @yarikoptic made their first contribution in containers/image#2214 @lstolcman made their first contribution in containers/image#2086 @bainsy88 made their first contribution in containers/image#2260 Full Changelog: containers/[email protected] Configuration 📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied. ♻ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 Ignore: Close this PR and you won't be reminded about this update again. If you want to rebase/retry this PR, check this box This PR has been generated by Mend Renovate. View repository job log here.
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.
Fixes #2205