Skip to content

Set default differ for the default unpack config of transfer service#11641

Merged
estesp merged 1 commit intocontainerd:mainfrom
henry118:differ
Apr 7, 2025
Merged

Set default differ for the default unpack config of transfer service#11641
estesp merged 1 commit intocontainerd:mainfrom
henry118:differ

Conversation

@henry118
Copy link
Member

@henry118 henry118 commented Apr 1, 2025

Set default differ for the default unpack config of transfer service.

Without explicit "unpack_config" configuration for the Transfer plugin, the plugin will pick the first Diff plugin that matches the platform. In my tests it selected the "erofs" diff plugin.

Without this change:

$ sudo ctr i pull docker.io/library/hello-world:latest
....
application/vnd.oci.image.index.v1+json sha256:7e1a4e2d11e2ac7a8c3f768d4166c2defeb09d2a750b010412b6ea13de1efb19
Pulling from OCI Registry (docker.io/library/hello-world:latest)        elapsed: 3.3 s  total:  41.2 K  (12.6 KiB/s)
ctr: rpc error: code = Unimplemented desc = method Transfer not implemented for containerd.types.transfer.OCIRegistry to containerd.types.transfer.ImageStore

Error logs shows:

Apr 01 21:23:33 ip-172-31-63-131 containerd[70526]: time="2025-04-01T21:23:33.341048713Z" level=error msg="transfer failed" error="failed to extract layer sha256:72e830a4dff5f0d5225cdc0a320e85ab1ce06ea5673acfe8d83a7645cbd0e9cf: mount layer type must be erofs-layer: not implemented"

After this change:

$ sudo ctr i pull docker.io/library/hello-world:latest
...
application/vnd.oci.image.index.v1+json sha256:7e1a4e2d11e2ac7a8c3f768d4166c2defeb09d2a750b010412b6ea13de1efb19
Pulling from OCI Registry (docker.io/library/hello-world:latest)        elapsed: 3.3 s  total:  43.5 K  (13.3 KiB/s)

@github-project-automation github-project-automation bot moved this to Needs Triage in Pull Request Review Apr 1, 2025
@dosubot dosubot bot added the area/distribution Image Distribution label Apr 1, 2025
@henry118
Set default differ for the default unpack config of transfer service
a083b66 
Signed-off-by: Henry Wang <henwang@amazon.com>
djdongjin
djdongjin approved these changes Apr 2, 2025
View reviewed changes
Copy link
Member

@djdongjin djdongjin left a comment

Choose a reason for hiding this comment

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

LGTM

@github-project-automation github-project-automation bot moved this from Needs Triage to Review In Progress in Pull Request Review Apr 7, 2025
@mxpv mxpv added this pull request to the merge queue Apr 7, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Apr 7, 2025
@estesp estesp moved this from Review In Progress to Merge on Green in Pull Request Review Apr 7, 2025
@estesp estesp added the cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch label Apr 7, 2025
@estesp estesp added this pull request to the merge queue Apr 7, 2025
@estesp estesp added the cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch label Apr 7, 2025
Merged via the queue into containerd:main with commit 041743e Apr 7, 2025
58 checks passed
@github-project-automation github-project-automation bot moved this from Merge on Green to Done in Pull Request Review Apr 7, 2025
@henry118 henry118 deleted the differ branch April 7, 2025 19:19
@estesp
Copy link
Member

estesp commented Apr 8, 2025

/cherrypick release/2.0

@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Apr 8, 2025

@estesp: #11641 failed to apply on top of branch "release/2.0":

Applying: Set default differ for the default unpack config of transfer service
Using index info to reconstruct a base tree...
M	defaults/defaults_linux.go
A	defaults/defaults_unix_nolinux.go
Falling back to patching base and 3-way merge...
Auto-merging defaults/defaults_linux.go
CONFLICT (content): Merge conflict in defaults/defaults_linux.go
Auto-merging defaults/defaults_darwin.go
CONFLICT (content): Merge conflict in defaults/defaults_darwin.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Set default differ for the default unpack config of transfer service
Details

In response to this:

/cherrypick release/2.0

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

This was referenced Apr 11, 2025
Merged
Merged
@estesp estesp added cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch and removed cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch labels Apr 11, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mxpv mxpv mxpv approved these changes

@estesp estesp estesp approved these changes

@djdongjin djdongjin djdongjin approved these changes

Assignees

No one assigned

Labels

area/distribution Image Distribution cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch size/XS

Projects

Pull Request Review
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@henry118 @estesp @k8s-infra-cherrypick-robot @mxpv @djdongjin @k8s-ci-robot