fix: use root_dir in save_to_oci_registry for correct OCI layer structure#2552
Merged
google-oss-prow[bot] merged 1 commit intokubeflow:mainfrom Apr 7, 2026
Merged
Conversation
…ture Pass individual file paths with root_dir to oci_layers_on_top instead of top-level directory entries. This produces one layer per file (instead of one layer per subdirectory) while preserving the original directory structure in layer arcnames via olot's root_dir support. Update the unit test to assert the new root_dir-based calling convention and add e2e test verification that inspects the actual OCI layout to confirm one-layer-per-file and correct path preservation. Related to kubeflow#2498 Resolves kubeflow#2520 AI-assisted: Claude Code (Opus 4.6) Signed-off-by: Jon Burdo <jon@jonburdo.com>
jonburdo
force-pushed
the
fix/save-to-oci-registry-layers
branch
from
421e545 to
cbf7c73
Compare
jonburdo
commented
Apr 6, 2026
Member
Author
jonburdo
left a comment
jonburdo
left a comment
There was a problem hiding this comment.
For additional context see:
- PR for adding
root_dirtooci_layers_on_topinolot: containers/olot#168 - explanation of the problem and manual testing output: #2521 (comment)
Comment on lines
+396
to
+398
| # Extract the absolute path from the files found in the path | ||
| files = [file[0] for file in _get_files_from_path(model_files_path)] # type: ignore[arg-type] | ||
| oci_layers_on_top(local_image_path, files, modelcard, root_dir=model_files_path) |
Member
Author
There was a problem hiding this comment.
Reverts back to what we add originally here, before a mitigation: https://github.com/kubeflow/model-registry/pull/2498/changes#diff-cd394845b1d31bff2290364330b210311c758b6f0b10ce787adaf91f7d6a6010L396-R400
and adds root_dir kwarg:
- oci_layers_on_top(local_image_path, files, modelcard)
+ oci_layers_on_top(local_image_path, files, modelcard, root_dir=model_files_path)
|
|
||
| huggingface-hub = { version = ">=0.20.1,<1.8.0", optional = true } | ||
| olot = { version = "^0.1.6", optional = true } | ||
| olot = { version = "^0.1.17", optional = true } |
Member
Author
There was a problem hiding this comment.
Upgrade needed for root_dir kwarg support in oci_layers_on_top
tarilabs
reviewed
Apr 7, 2026
Comment on lines
+396
to
+398
| # Extract the absolute path from the files found in the path | ||
| files = [file[0] for file in _get_files_from_path(model_files_path)] # type: ignore[arg-type] | ||
| oci_layers_on_top(local_image_path, files, modelcard, root_dir=model_files_path) |
8 tasks
Member
|
/approve |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: tarilabs The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
This was referenced Apr 8, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Pass individual file paths with root_dir to oci_layers_on_top instead of top-level directory entries. This produces one layer per file (instead of one layer per subdirectory) while preserving the original directory structure in layer arcnames via olot's root_dir support.
Update the unit test to assert the new root_dir-based calling convention and add e2e test verification that inspects the actual OCI layout to confirm one-layer-per-file and correct path preservation.
Related to #2498
Resolves #2520
AI-assisted: Claude Code (Opus 4.6)
Description
How Has This Been Tested?
Merge criteria:
DCOcheck)ok-to-testhas been added to the PR.If you have UI changes