Revert "storage: Preserve knownRepoDigests order in ImageStatus" by saschagrunert · Pull Request #9730 · cri-o/cri-o

saschagrunert · 2026-01-29T14:40:18Z

What type of PR is this?

/kind bug

What this PR does / why we need it:

This reverts commit f6bc16b.

Which issue(s) this PR fixes:

None

Special notes for your reviewer:

None

Does this PR introduce a user-facing change?

None

Summary by CodeRabbit

Refactor
- Simplified image digest handling and canonical reference construction
- Streamlined OCI artifact processing logic
- Updated container image name resolution to use available repository digests directly
- Removed complex digest override and ordering mechanisms
Tests
- Removed digest ordering verification tests

_{✏️ Tip: You can customize this high-level summary in your review settings.}

openshift-ci · 2026-01-29T14:40:41Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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:

~~OWNERS~~ [saschagrunert]

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

coderabbitai · 2026-01-29T14:40:49Z

📝 Walkthrough

Walkthrough

This pull request simplifies image digest handling and canonical reference logic across the image storage and container management layers. Changes include streamlining the two-stage digest ordering mechanism into a single unified sort, simplifying OCI artifact handling to use a direct canonical reference path, removing conditional overrides in container image resolution, and eliminating digest-based filtering in image naming logic. Two test cases validating digest ordering are removed.

Changes

Cohort / File(s)	Summary
Image Digest and Reference Handling `internal/storage/image.go`	Refactored buildImageResult to consolidate two-stage digest ordering into a single sort operation. Simplified pullImageImplementation's OCI artifact handling by using artifactManifestDigest directly and removing separate manifest digest computation and reordering logic.
Container Image Resolution and Status `server/container_create.go`, `server/container_status.go`	Removed user-requested digest override logic in resolveAndVerifyContainerImage; now always uses the first RepoDigest. Simplified imageNameInSpec to remove conditional filtering based on digest indicators and always use available out-of-process string names.
Test Suite Updates `test/image.bats`	Removed two test cases that validated multi-arch and single-arch digest ordering and RepoDigests presence.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Possibly related PRs

OCPNODE-3811: Migrate artifact implementation #9621: Modifies similar digest and canonical reference logic in pullImageImplementation and OCI artifact handling paths.

Suggested reviewers

mrunalp
hasan4791

Poem

🐰 The digests now march in orderly line,
No special treatment, just sorted so fine,
Two-stage becomes one, a hop and a bound,
Simpler paths where complexity drowned!

🚥 Pre-merge checks | ✅ 3

✅ Passed checks (3 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title accurately describes the main change—reverting a commit that preserved knownRepoDigests order. The PR systematically undoes this change across multiple files, matching the stated objective.
Docstring Coverage	✅ Passed	Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing touches

📝 Generate docstrings

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.}

This reverts commit f6bc16b. Signed-off-by: Sascha Grunert <sgrunert@redhat.com>

mtrmac

Thanks!

saschagrunert · 2026-01-29T14:48:13Z

@mtrmac PTAL, the code evolved and I had to fix a conflict during revert.

/cherry-pick release-1.35

openshift-cherrypick-robot · 2026-01-29T14:48:17Z

@saschagrunert: once the present PR merges, I will cherry-pick it on top of release-1.35 in a new PR and assign it to you.

Details

In response to this:

@mtrmac PTAL, the code evolved and I had to fix a conflict during revert.

/cherry-pick release-1.35

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.

codecov · 2026-01-29T16:37:54Z

Codecov Report

❌ Patch coverage is 64.28571% with 5 lines in your changes missing coverage. Please review.
✅ Project coverage is 67.49%. Comparing base (b17d6bc) to head (eccac32).
⚠️ Report is 7 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #9730      +/-   ##
==========================================
+ Coverage   64.39%   67.49%   +3.10%     
==========================================
  Files         210      210              
  Lines       29100    29043      -57     
==========================================
+ Hits        18740    19604     +864     
+ Misses       8667     7757     -910     
+ Partials     1693     1682      -11

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

saschagrunert · 2026-01-29T16:38:11Z

/retest

saschagrunert · 2026-01-30T07:39:09Z

/retest

saschagrunert · 2026-01-30T10:27:36Z

/test e2e-aws-ovn

haircommander · 2026-02-02T18:51:53Z

/lgtm

openshift-cherrypick-robot · 2026-02-02T22:03:16Z

@saschagrunert: new pull request created: #9739

Details

In response to this:

@mtrmac PTAL, the code evolved and I had to fix a conflict during revert.

/cherry-pick release-1.35

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.

saschagrunert requested a review from mrunalp as a code owner January 29, 2026 14:40

openshift-ci Bot added the release-note-none Denotes a PR that doesn't merit a release note. label Jan 29, 2026

openshift-ci Bot requested review from bitoku and hasan4791 January 29, 2026 14:40

openshift-ci Bot added kind/bug Categorizes issue or PR as related to a bug. dco-signoff: no Indicates the PR's author has not DCO signed all their commits. labels Jan 29, 2026

saschagrunert mentioned this pull request Jan 29, 2026

Preserve knownRepoDigests order in ImageStatus #9615

Merged

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

saschagrunert force-pushed the revert-f6bc16be branch from 5c06687 to f2455f0 Compare January 29, 2026 14:41

openshift-ci Bot added dco-signoff: yes Indicates the PR's author has DCO signed all their commits. and removed dco-signoff: no Indicates the PR's author has not DCO signed all their commits. labels Jan 29, 2026

saschagrunert changed the title ~~Revert "storage: Preserve knownRepoDigests order in ImageStatus"~~ WIP: Revert "storage: Preserve knownRepoDigests order in ImageStatus" Jan 29, 2026

openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 29, 2026

Revert "storage: Preserve knownRepoDigests order in ImageStatus"

eccac32

This reverts commit f6bc16b. Signed-off-by: Sascha Grunert <sgrunert@redhat.com>

saschagrunert force-pushed the revert-f6bc16be branch from f2455f0 to eccac32 Compare January 29, 2026 14:45

mtrmac reviewed Jan 29, 2026

View reviewed changes

saschagrunert changed the title ~~WIP: Revert "storage: Preserve knownRepoDigests order in ImageStatus"~~ Revert "storage: Preserve knownRepoDigests order in ImageStatus" Jan 29, 2026

openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 29, 2026

openshift-ci Bot assigned haircommander Feb 2, 2026

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Feb 2, 2026

openshift-merge-bot Bot merged commit b83b43a into cri-o:main Feb 2, 2026
79 of 81 checks passed

openshift-cherrypick-robot mentioned this pull request Feb 2, 2026

[release-1.35] Revert "storage: Preserve knownRepoDigests order in ImageStatus" #9739

Merged

saschagrunert deleted the revert-f6bc16be branch February 3, 2026 07:59

coderabbitai Bot mentioned this pull request Feb 3, 2026

Return image ID from PullImage instead of repo digest #9728

Merged

coderabbitai Bot mentioned this pull request May 6, 2026

OCPBUGS-81273: Persist image repo digest across CRI-O restarts #9925

Merged

Conversation

saschagrunert commented Jan 29, 2026 • edited by coderabbitai Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Summary by CodeRabbit

Uh oh!

openshift-ci Bot commented Jan 29, 2026

Uh oh!

coderabbitai Bot commented Jan 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Estimated code review effort

Possibly related PRs

Suggested reviewers

Poem

Uh oh!

mtrmac left a comment

Choose a reason for hiding this comment

Uh oh!

saschagrunert commented Jan 29, 2026

Uh oh!

openshift-cherrypick-robot commented Jan 29, 2026

Uh oh!

codecov Bot commented Jan 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

saschagrunert commented Jan 29, 2026

Uh oh!

saschagrunert commented Jan 30, 2026

Uh oh!

saschagrunert commented Jan 30, 2026

Uh oh!

haircommander commented Feb 2, 2026

Uh oh!

Uh oh!

openshift-cherrypick-robot commented Feb 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

saschagrunert commented Jan 29, 2026 •

edited by coderabbitai Bot

Loading

coderabbitai Bot commented Jan 29, 2026 •

edited

Loading

codecov Bot commented Jan 29, 2026 •

edited

Loading