Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update c/image and update tests #5932

Merged
merged 1 commit into from
Jan 23, 2025

Conversation

mtrmac
Copy link
Contributor

@mtrmac mtrmac commented Jan 22, 2025

… per failures in #5929 .

What type of PR is this?

/kind other

What this PR does / why we need it:

How to verify it

Existing tests + containers/podman#25007 .

Which issue(s) this PR fixes:

None

Special notes for your reviewer:

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.

go.mod Outdated

require (
github.com/containerd/platforms v1.0.0-rc.1
github.com/containernetworking/cni v1.2.3
github.com/containers/common v0.61.1
github.com/containers/image/v5 v5.33.1
github.com/containers/common v0.61.0
Copy link
Member

Choose a reason for hiding this comment

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

This is downgrading c/common, I would suggest you just bump it to main

Copy link
Contributor Author

@mtrmac mtrmac Jan 22, 2025

Choose a reason for hiding this comment

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

Oops, thanks for noticing that.

This is almost certainly because the latest c/image release is from a (comparatively) fairly old stable branch, and Go doesn’t know that main is ahead.

containers/image#2691 should help, then I’ll update this PR. Marking as draft in the meantime.

To do this, update expected errors when pulling encrypted images

containers/image#2646 will track actually
returning a meaningful error instead of these internal details.

Signed-off-by: Miloslav Trmač <[email protected]>
@mtrmac
Copy link
Contributor Author

mtrmac commented Jan 22, 2025

@Luap99 Rebased, tests passed at least once; ready for review.

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

@Luap99
Copy link
Member

Luap99 commented Jan 23, 2025

@TomSweeneyRedHat @nalind @rhatdan PTAL
(needs an approve in order to merge)

@mheon
Copy link
Member

mheon commented Jan 23, 2025

/approve

1 similar comment
@nalind
Copy link
Member

nalind commented Jan 23, 2025

/approve

Copy link
Contributor

openshift-ci bot commented Jan 23, 2025

[APPROVALNOTIFIER] This PR is APPROVED

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

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@TomSweeneyRedHat
Copy link
Member

LGTM

@TomSweeneyRedHat
Copy link
Member

@Luap99 needs a rebase, but GTG once done.

@openshift-merge-bot openshift-merge-bot bot merged commit b48b0fc into containers:main Jan 23, 2025
32 checks passed
@mtrmac mtrmac deleted the c-image-tests branch January 23, 2025 22:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants