Skip to content

Conversation

@dmcgowan
Copy link
Member

Updates the defaults for the pull process to match the snapshotter/differ defaults on darwin.

Some of these defaults, such as trying erofs for differ service, could be safely applied to Linux as well. This change is scoped to fixing broken defaults rather than changing existing or otherwise working defaults. We should consider making those default changes for the next release though.

@dmcgowan dmcgowan added the cherry-pick/2.2.x Change to be cherry picked to release/2.2 branch label Nov 18, 2025
@github-project-automation github-project-automation bot moved this to Needs Triage in Pull Request Review Nov 18, 2025
@dosubot dosubot bot added the area/distribution Image Distribution label Nov 18, 2025
Use the Linux default rather than the block size from the local macOS
system. The local macOS block size is not relevant as the erofs file
will not be mounted directly on macOS.

Signed-off-by: Derek McGowan <derek@mcg.dev>
@dmcgowan dmcgowan force-pushed the erofs-defaults-darwin branch from f1dc303 to 8ce044f Compare November 18, 2025 00:35
Copy link
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

LGTM

Non-Linux hosts are not expected to be able to directly mount erofs
snapshotters on the host system. Non-Linux hosts should use block mode
by default with a reasonably set default block size.

Signed-off-by: Derek McGowan <derek@mcg.dev>
Use the erofs differ by default on darwin. This could be default for all
Unix platforms but limit the default changes to fix broken cases for backports.

Signed-off-by: Derek McGowan <derek@mcg.dev>
Fix the default unpack configuration on darwin to a usable
configuration.

Signed-off-by: Derek McGowan <derek@mcg.dev>
Match the defaults set by the transfer service which will configure
linux by default on darwin hosts.

Signed-off-by: Derek McGowan <derek@mcg.dev>
@dmcgowan dmcgowan force-pushed the erofs-defaults-darwin branch from 8ce044f to c2b22d6 Compare November 18, 2025 16:52
@github-project-automation github-project-automation bot moved this from Needs Triage to Review In Progress in Pull Request Review Nov 18, 2025
@fuweid fuweid enabled auto-merge November 18, 2025 17:51
@fuweid fuweid added this pull request to the merge queue Nov 18, 2025
Merged via the queue into containerd:main with commit 8d0b648 Nov 18, 2025
90 of 92 checks passed
@github-project-automation github-project-automation bot moved this from Review In Progress to Done in Pull Request Review Nov 18, 2025
@dmcgowan
Copy link
Member Author

/cherry-pick release/2.2

@dmcgowan dmcgowan deleted the erofs-defaults-darwin branch November 19, 2025 00:13
@k8s-infra-cherrypick-robot

@dmcgowan: new pull request created: #12544

Details

In response to this:

/cherry-pick release/2.2

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.

@austinvazquez austinvazquez added cherry-picked/2.2.x PR commits are cherry-picked into release/2.2 branch and removed cherry-pick/2.2.x Change to be cherry picked to release/2.2 branch labels Dec 11, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/distribution Image Distribution cherry-picked/2.2.x PR commits are cherry-picked into release/2.2 branch size/L

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

7 participants