Skip to content

Migrate CRI-O annotations to v2 format - #5335

Open
saschagrunert wants to merge 1 commit into
openshift:mainfrom
saschagrunert:annotation-v2-migration
Open

Migrate CRI-O annotations to v2 format#5335
saschagrunert wants to merge 1 commit into
openshift:mainfrom
saschagrunert:annotation-v2-migration

Conversation

@saschagrunert

@saschagrunert saschagrunert commented Jul 27, 2026

Copy link
Copy Markdown
Member

CRI-O migrated its annotations from v1 (io.kubernetes.cri-o.*) to v2 (*.crio.io) in December 2025. The old format is deprecated.

This updates the io.kubernetes.cri-o.Devices annotation to its v2 equivalent devices.crio.io in the pod utility code and related test fixtures.

Tracking: cri-o/cri-o#10194

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: automatic mode

@coderabbitai

coderabbitai Bot commented Jul 27, 2026

Copy link
Copy Markdown
📝 Walkthrough

Walkthrough

Changes

Nested Podman device configuration

Layer / File(s) Summary
Device annotation and fixture alignment
pkg/util/pods.go, pkg/steps/multi_stage/testdata/*
ConfigurePodForNestedPodman and two generated-pod fixtures now use devices.crio.io while retaining /dev/fuse,/dev/net/tun.

Estimated code review effort: 1 (Trivial) | ~5 minutes

🚥 Pre-merge checks | ✅ 17
✅ Passed checks (17 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Go Error Handling ✅ Passed Touched code only changes an annotation key; no error paths, ignored errors, panics, or new nil dereferences were introduced.
Test Coverage For New Features ✅ Passed Existing golden tests in TestGeneratePods cover nested-podman pod generation; the updated fixtures would fail without the annotation change.
Stable And Deterministic Test Names ✅ Passed No Ginkgo titles were added or modified in the touched files; changes are limited to annotation keys in code and YAML fixtures.
Test Structure And Quality ✅ Passed No Ginkgo test code changed; the patch only updates a pod annotation in production code and snapshot YAML fixtures, so the test-quality checks don’t apply.
Microshift Test Compatibility ✅ Passed No new Ginkgo e2e specs were added; the diff only updates a pod annotation and matching test fixtures, so no MicroShift-incompatible APIs/features are introduced.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PASS: The PR only changes a pod annotation and YAML fixtures; no new Ginkgo e2e tests or SNO-sensitive assumptions were added.
Topology-Aware Scheduling Compatibility ✅ Passed Only a pod annotation key changed; no topology, affinity, replica, nodeSelector, or taint-based scheduling logic was added.
Ote Binary Stdout Contract ✅ Passed PASS: touched code only changes pod annotations; no main/init/TestMain/suite setup or stdout writes were added.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed The PR only renames a pod annotation and updates YAML fixtures; no new Ginkgo e2e tests, IPv4-only logic, or external connectivity were added.
No-Weak-Crypto ✅ Passed Touched files only change pod annotations and fixtures; no weak crypto, custom crypto, or non-constant-time secret comparisons were introduced.
Container-Privileges ✅ Passed Diff only swaps the CRI-O device annotation key; no new privileged, host*, SYS_ADMIN, or privilege-escalation settings were introduced.
No-Sensitive-Data-In-Logs ✅ Passed Touched code only swaps a pod annotation key and fixture YAML; no new log statements or sensitive data exposure was added.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately summarizes the main change: migrating CRI-O annotations from the old format to the v2 annotation key.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@openshift-ci

openshift-ci Bot commented Jul 27, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: saschagrunert
Once this PR has been reviewed and has the lgtm label, please assign bear-redhat for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

@saschagrunert

Copy link
Copy Markdown
Member Author

/retest

1 similar comment
@saschagrunert

Copy link
Copy Markdown
Member Author

/retest

@openshift-ci

openshift-ci Bot commented Jul 27, 2026

Copy link
Copy Markdown
Contributor

@saschagrunert: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/integration 11c8226 link true /test integration

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

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.

1 participant