Skip to content

Add snapshotter and differ for block CIMs#12050

Merged
kiashok merged 1 commit intocontainerd:mainfrom
ambarve:block_cim_snapshotter
Jul 31, 2025
Merged

Add snapshotter and differ for block CIMs#12050
kiashok merged 1 commit intocontainerd:mainfrom
ambarve:block_cim_snapshotter

Conversation

@ambarve
Copy link
Contributor

@ambarve ambarve commented Jul 1, 2025

This commit adds the snapshotter and differ plugins that can be used to pull/import container images in the block CIM format. (More about block CIMs here.)

@github-project-automation github-project-automation bot moved this to Needs Triage in Pull Request Review Jul 1, 2025
@k8s-ci-robot
Copy link

k8s-ci-robot commented Jul 1, 2025

Hi @ambarve. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

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.

@ambarve ambarve force-pushed the block_cim_snapshotter branch from 95360c6 to 86cc301 Compare July 1, 2025 22:47
@ambarve ambarve force-pushed the block_cim_snapshotter branch 5 times, most recently from e96a212 to b16f046 Compare July 3, 2025 17:45
@ambarve ambarve force-pushed the block_cim_snapshotter branch from b16f046 to d14117f Compare July 9, 2025 16:56
@ambarve ambarve marked this pull request as ready for review July 9, 2025 17:00
@dosubot dosubot bot added go Pull requests that update Go code platform/windows Windows labels Jul 9, 2025
@ambarve ambarve force-pushed the block_cim_snapshotter branch from d14117f to e0f0761 Compare July 10, 2025 12:29
@ambarve
Copy link
Contributor Author

ambarve commented Jul 15, 2025

@kiashok & @fuweid Could you please review this change?

kiashok
kiashok reviewed Jul 21, 2025
View reviewed changes
plugins/snapshots/windows/block_cimfs.go
return false, err
}
return true, nil
}
Copy link
Contributor

@kiashok kiashok Jul 21, 2025

Choose a reason for hiding this comment

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

Can we add a Cleanup() function like the other linux snapshotters have to take care of deleting any orphaned directories? I think we had decided on adding one for windows snapshotter for long term too.

Copy link
Contributor Author

@ambarve ambarve Jul 23, 2025

Choose a reason for hiding this comment

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

I looked at the changes required for this and I think this will affect the existing Windows & cimfs snapshotters too. Plus, we may also want to implement it for the LCOW snapshotter. I think that should be a separate PR. What do you think?

Copy link
Contributor

@kiashok kiashok Jul 23, 2025

Choose a reason for hiding this comment

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

Sure we can do that.

@kiashok
Copy link
Contributor

kiashok commented Jul 23, 2025

LGTM

@kiashok
Copy link
Contributor

kiashok commented Jul 23, 2025

@cpuguy83 @fuweid could you please take a look when you have some time? Thanks!

cpuguy83
cpuguy83 requested changes Jul 24, 2025
View reviewed changes
Copy link
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

I don't see anything glaringly wrong here.

@github-project-automation github-project-automation bot moved this from Needs Triage to Needs Update in Pull Request Review Jul 24, 2025
@ambarve ambarve force-pushed the block_cim_snapshotter branch 3 times, most recently from 3d437da to 05c04dc Compare July 25, 2025 18:28
@ambarve ambarve force-pushed the block_cim_snapshotter branch from 05c04dc to adec7d7 Compare July 28, 2025 21:31
@ambarve
Copy link
Contributor Author

ambarve commented Jul 29, 2025

@fuweid & @cpuguy83 could you please take another look and/or approve this PR?

@github-project-automation github-project-automation bot moved this from Needs Update to Review In Progress in Pull Request Review Jul 29, 2025
@kiashok kiashok added this pull request to the merge queue Jul 29, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jul 29, 2025
@ambarve ambarve force-pushed the block_cim_snapshotter branch from adec7d7 to beede8d Compare July 29, 2025 19:14
@ambarve
Block CIM snapshotter & differ
0096252 
Add new snapshotter & differ plugins that can leverage the block CIM layer writers to
store pulled/imported images in the block CIM format.

Signed-off-by: Amit Barve <[email protected]>
@ambarve ambarve force-pushed the block_cim_snapshotter branch from beede8d to 0096252 Compare July 30, 2025 18:47
@kiashok
Copy link
Contributor

kiashok commented Jul 31, 2025

/retest

@kiashok kiashok added this pull request to the merge queue Jul 31, 2025
Merged via the queue into containerd:main with commit c72f82d Jul 31, 2025
85 of 86 checks passed
@github-project-automation github-project-automation bot moved this from Review In Progress to Done in Pull Request Review Jul 31, 2025
@dmcgowan dmcgowan mentioned this pull request Sep 11, 2025
Merged
@dmcgowan dmcgowan mentioned this pull request Oct 26, 2025
Merged
@dmcgowan dmcgowan mentioned this pull request Nov 5, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cpuguy83 cpuguy83 cpuguy83 approved these changes

@kiashok kiashok kiashok approved these changes

Assignees

No one assigned

Labels

area/storage Image Storage go Pull requests that update Go code impact/changelog needs-ok-to-test platform/windows Windows size/XXL

Projects

Pull Request Review
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@ambarve @k8s-ci-robot @kiashok @cpuguy83 @dmcgowan