Skip to content

[release-1.35] Add support for additional read-only artifact stores#9829

Merged
openshift-merge-bot[bot] merged 2 commits into
cri-o:release-1.35from
openshift-cherrypick-robot:cherry-pick-9702-to-release-1.35
Mar 19, 2026
Merged

[release-1.35] Add support for additional read-only artifact stores#9829
openshift-merge-bot[bot] merged 2 commits into
cri-o:release-1.35from
openshift-cherrypick-robot:cherry-pick-9702-to-release-1.35

Conversation

@openshift-cherrypick-robot

Copy link
Copy Markdown

This is an automated cherry-pick of #9702

/assign saschagrunert

Added support for configuring additional read-only artifact stores via the `additional_artifact_stores` configuration option.

pauloappbr and others added 2 commits March 18, 2026 20:36
This commit implements the logic allowing users to configure additional
read-only paths for OCI artifacts. This addresses use cases where artifacts
(such as large AI models) are pre-populated on shared filesystems or
read-only media, preventing redundant downloads to the graph root.

Changes included:

1. Core Logic (internal/ociartifact):
   - Updated `Store` struct and `NewStore` to accept `additionalPaths`.
   - Implemented `resolveRootPath` helper to look up artifacts in additional
     stores before falling back to the main writeable store.
   - Updated `PullData`, `List`, and `BlobMountPaths` to respect these paths.

2. Configuration (pkg/config):
   - Added `AdditionalArtifactStores` slice to `RuntimeConfig`.

3. Wiring (server):
   - Injected the configuration value into the artifact store initialization.

4. Build & Test Fixes:
   - Updated `NewStore` signatures in `internal/storage/image.go` and
     `seccompociartifact.go`.
   - Added missing test helpers (`SetState`, `SetImpl`, `SetCgroupManager`)
     in `container.go`, `config.go`, and `seccompociartifact.go` to ensure
     full project compilation and test passing.

Fixes: cri-o#9570
Related: cri-o#9583

Signed-off-by: Paulo Henrique <paulo.hco47@gmail.com>
- Only skip pulling for artifacts found in additional (read-only) stores,
  not the main store, so tag re-pointing still works as expected
- Deduplicate List results by reference only (additional stores win)
- Move implementation detail from doc comment into function body
- Mark additional_artifact_stores as experimental, subject to change

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
@openshift-ci openshift-ci Bot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Mar 18, 2026
@coderabbitai

coderabbitai Bot commented Mar 18, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 58449d2c-299b-44e6-b82d-3c1f0549543b

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
📝 Coding Plan
  • Generate coding plan for human review comments

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci openshift-ci Bot added the dco-signoff: yes Indicates the PR's author has DCO signed all their commits. label Mar 18, 2026
@openshift-ci openshift-ci Bot requested review from QiWang19 and hasan4791 March 18, 2026 20:36
@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Mar 18, 2026
@openshift-ci

openshift-ci Bot commented Mar 18, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, saschagrunert

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 18, 2026
@codecov

codecov Bot commented Mar 18, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 19.81982% with 89 lines in your changes missing coverage. Please review.
✅ Project coverage is 46.48%. Comparing base (f998e4a) to head (bb56c33).
⚠️ Report is 3 commits behind head on release-1.35.

❗ There is a different number of reports uploaded between BASE (f998e4a) and HEAD (bb56c33). Click for more details.

HEAD has 7 uploads less than BASE
Flag BASE (f998e4a) HEAD (bb56c33)
10 3
Additional details and impacted files
@@                Coverage Diff                @@
##           release-1.35    #9829       +/-   ##
=================================================
- Coverage         67.53%   46.48%   -21.06%     
=================================================
  Files               211      169       -42     
  Lines             29161    25757     -3404     
=================================================
- Hits              19693    11972     -7721     
- Misses             7793    12602     +4809     
+ Partials           1675     1183      -492     
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@saschagrunert

Copy link
Copy Markdown
Member

/override ci/prow/e2e-aws-ovn

@openshift-ci

openshift-ci Bot commented Mar 19, 2026

Copy link
Copy Markdown
Contributor

@saschagrunert: Overrode contexts on behalf of saschagrunert: ci/prow/e2e-aws-ovn

Details

In response to this:

/override ci/prow/e2e-aws-ovn

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.

@openshift-merge-bot openshift-merge-bot Bot merged commit 45558dc into cri-o:release-1.35 Mar 19, 2026
40 of 51 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants