Skip to content

Conversation

cyphar
Copy link
Contributor

@cyphar cyphar commented May 20, 2025

This allows us to switch away from our umoci fork now that upstream
supports OverlayfsRootfs and the various features we need.

Signed-off-by: Aleksa Sarai cyphar@cyphar.com

Copy link

codecov bot commented May 21, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 60.35%. Comparing base (f7e243f) to head (0e5ca13).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #694      +/-   ##
==========================================
- Coverage   60.44%   60.35%   -0.10%     
==========================================
  Files          59       59              
  Lines        6457     6444      -13     
==========================================
- Hits         3903     3889      -14     
- Misses       1908     1910       +2     
+ Partials      646      645       -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@hallyn
Copy link
Contributor

hallyn commented May 21, 2025

Thanks! This looks great.

@cyphar cyphar changed the title [do not merge] deps: update to github.com/opencontainers/umoci@v0.5.0 feat: update to github.com/opencontainers/umoci@v0.5.0 May 21, 2025
@cyphar cyphar marked this pull request as ready for review May 21, 2025 07:14
@cyphar cyphar requested review from rchincha, smoser and hallyn as code owners May 21, 2025 07:14
@cyphar
Copy link
Contributor Author

cyphar commented May 21, 2025

Updated to use the actual release. This is missing some of the patches from your fork, so I would suggest doing some extra testing to make sure that I didn't subtly break anything (in particular, all of the lowerdir tracking isn't in umoci because it wasn't necessary to implement the minimal version of plain-to-opaque whiteout conversion).

@cyphar
Copy link
Contributor Author

cyphar commented May 26, 2025

WDYT @rchincha?

@chinchani
Copy link

chinchani commented May 27, 2025

589a648

CI Failure related to this. IIRC, we were trying to keep stacker and skopeo in sync wrt layer compression else they would change underneath us.

@rchincha
Copy link
Contributor

We need to update skopeo to match the pgzip version between skopeo and
umoci.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
@cyphar
Copy link
Contributor Author

cyphar commented May 29, 2025

@rchincha Sure, pushed.

Copy link
Contributor

@rchincha rchincha left a comment

Choose a reason for hiding this comment

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

lgtm

@rchincha
Copy link
Contributor

The main changes afaict between skopeo 1.9.3 ... 1.13.0 are:
For 1.9.3: klauspost/pgzip@1.2.5 which calls into klauspost/compress@1.15.9
For 1.13.0: klauspost/pgzip@1.2.6 which calls into klauspost/compress@1.16.6

@rchincha
Copy link
Contributor

Have run the CI multiple times without any failures now.

This allows us to switch away from our umoci fork now that upstream
supports OverlayfsRootfs and the various features we need. The key
changes that allow us to switch away from our fork are:

 * opencontainers/umoci#572 which implemented a large number of fixes
   to overlayfs handling, such as opaque whiteouts and several features
   not implemented in our fork (xattr escaping, handling of missing
   parent directories, improved rootless support, handling of nested
   whiteouts inside an opaque whiteout).

 * opencontainers/umoci#581 which switched to a Docker-friendly gzip
   block size by default, removing the need to configure it (as
   suggested in opencontainers/umoci#509).

 * opencontainers/umoci#587 which implemented full configurable
   userxattr (user.overlay.*) support.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
@rchincha rchincha requested a review from raharper May 31, 2025 05:36
@rchincha rchincha merged commit 8f76682 into project-stacker:main May 31, 2025
12 of 13 checks passed
@cyphar cyphar deleted the umoci-0.5 branch June 2, 2025 15:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants