Skip to content

Backport erofs snapshotter into containerd2 #14513

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

Draft
wants to merge 2 commits into
base: 3.0-dev
Choose a base branch
from

Conversation

aadhar-agarwal
Copy link
Contributor

@aadhar-agarwal aadhar-agarwal commented Aug 13, 2025

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./LICENSES-AND-NOTICES/SPECS/data/licenses.json, ./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md, ./LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge

Summary

What does the PR accomplish, why was it needed?

  • This PR backports the erofs snapshotter from containerd 2.1.2 into containerd 2.0.0
  • It adds 2 patches:
    • One to add the existing erofs snapshotter implementation that exists in 2.1.2
    • One to add additional changes that adds the tar index mode, dmverity and local signature support
Change Log
  • containerd2
Does this affect the toolchain?

NO

Test Methodology
  • Buddy build - pass

  • [AMD64-3-OneBranch]-Dev-BuildImages - pass
  • [ARM64-3-OneBranch]-Dev-BuildImages - pass
  • Testing on a normal AKS image:

@microsoft-github-policy-service microsoft-github-policy-service bot added Packaging 3.0-dev PRs Destined for AzureLinux 3.0 labels Aug 13, 2025
@CBL-Mariner-Bot
Copy link
Collaborator

CBL-Mariner-Bot commented Aug 13, 2025

✅ PR Check Passed

No critical issues detected in spec file changes.

🤖 AI Analysis Summary:

Brief Analysis: The changes in containerd2.spec and the accompanying patch files integrate new erofs snapshotter functionality and several CVE fixes properly. All patch references used in the spec match with the files present in the package.

Critical Issues Found: No ERROR/CRITICAL security issues detected.

Recommended Actions:
• Verify that %autosetup (or %patch directives) correctly applies all patches during build.
• Double‐check patch file names and numbering to ensure they adhere strictly to the “CVE-YYYY-XXXXX.patch” format.
• Review the README/changelog entries to confirm all CVE fixes are fully documented with proper attribution.


📋 For detailed analysis and recommendations, check the Azure DevOps pipeline logs.

@aadhar-agarwal aadhar-agarwal force-pushed the aadagarwal/backport-erofs-snapshotter-containerd2 branch from a97edd6 to a233bc2 Compare August 15, 2025 21:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3.0-dev PRs Destined for AzureLinux 3.0 Packaging
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants