Skip to content

Update c/image + existing tests to resolve the signing ambiguity#25096

Merged
openshift-merge-bot[bot] merged 4 commits intocontainers:mainfrom
mtrmac:zstd-chunked-without-tests
Jan 23, 2025
Merged

Update c/image + existing tests to resolve the signing ambiguity#25096
openshift-merge-bot[bot] merged 4 commits intocontainers:mainfrom
mtrmac:zstd-chunked-without-tests

Conversation

@mtrmac
Copy link
Contributor

@mtrmac mtrmac commented Jan 22, 2025

This is a subset of #25007, without the newly-added tests (discussed there); filed separately to allow updating c/image, so that others don’t have to resolve the test failures.

Does this PR introduce a user-facing change?

Partial pulls (pulling zstd:chunked images) now only happen for images that have RootFS.DiffID entry
in the config, and require the layer contents to match.

https://github.com/containers/image/issues/2646 will track actually
returning a meaningful error instead of these internal details.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This resolves the "signing ambiguity" by requiring that images
must have a DiffID entry, and it must match, in partial pulls.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
…ifferent methods"

This reverts commit 1d7ec1e.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Read the full one, not the truncated one

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
@openshift-ci openshift-ci bot added release-note approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 22, 2025
Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

/lgtm

Thanks merging this to unblock the vendor situation here

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 23, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 23, 2025

[APPROVALNOTIFIER] This PR is APPROVED

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

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 c0ec44f into containers:main Jan 23, 2025
@mtrmac mtrmac deleted the zstd-chunked-without-tests branch January 23, 2025 21:45
@stale-locking-app stale-locking-app bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Apr 24, 2025
@stale-locking-app stale-locking-app bot locked as resolved and limited conversation to collaborators Apr 24, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants