Skip to content

Migrate CRI-O annotations to v2 format - #6342

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

Migrate CRI-O annotations to v2 format#6342
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

- What I did
Migrated deprecated CRI-O v1 annotations (io.kubernetes.cri-o.*) to v2 format (*.crio.io) in the crio.yaml templates for master, worker, and arbiter roles:

  • io.kubernetes.cri-o.Devices -> devices.crio.io
  • io.kubernetes.cri-o.LinkLogs -> link-logs.crio.io
  • io.kubernetes.cri-o.userns-mode -> userns-mode.crio.io

Part of: cri-o/cri-o#10194

- How to verify it
Check that the crio.yaml templates use the new v2 annotation format.

- Description for the changelog
Migrate CRI-O annotations from deprecated v1 (io.kubernetes.cri-o.*) to v2 (*.crio.io) format.

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: LGTM mode

@coderabbitai

coderabbitai Bot commented Jul 27, 2026

Copy link
Copy Markdown

Walkthrough

Updated CRI-O annotation allowlists in arbiter, master, and worker container runtime templates, replacing legacy io.kubernetes.cri-o.* keys with CRI-O-specific annotation names for runc, crun, and OpenShift builder workloads.

Changes

CRI-O annotation allowlists

Layer / File(s) Summary
Update runtime and builder allowlists
templates/*/01-*-container-runtime/_base/files/crio.yaml
Runc, crun, and OpenShift builder allowed_annotations entries now use devices.crio.io, link-logs.crio.io, and userns-mode.crio.io across arbiter, master, and worker templates.

Estimated code review effort: 2 (Simple) | ~10 minutes

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 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.
Stable And Deterministic Test Names ✅ Passed The PR only updates CRI-O YAML templates; no Ginkgo tests or test titles are changed, so there are no dynamic test-name risks.
Test Structure And Quality ✅ Passed PR only changes three CRI-O YAML templates; no Ginkgo test code or test fixtures were modified, so the checklist is not applicable.
Microshift Test Compatibility ✅ Passed Only CRI-O YAML templates changed; no new Ginkgo tests or unsupported MicroShift APIs/features were added.
Single Node Openshift (Sno) Test Compatibility ✅ Passed Only CRI-O YAML templates changed; no new Ginkgo/e2e tests were added, so the SNO compatibility check is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed Changes are limited to CRI-O annotation allowlists in crio.yaml; no replicas, affinity, nodeSelector, tolerations, or topology-dependent scheduling logic was added.
Ote Binary Stdout Contract ✅ Passed PR only changes CRI-O YAML templates; no main/init/TestMain/suite code or stdout logging was added.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed No new Ginkgo/e2e tests were added; the PR only updates CRI-O YAML allowlists, so the IPv6/disconnected-network check is not applicable.
No-Weak-Crypto ✅ Passed Touched files only rename CRI-O annotation allowlists; no MD5/SHA1/DES/RC4/ECB, custom crypto, or secret comparisons appear in the diff.
Container-Privileges ✅ Passed PR only edits CRI-O annotation allowlists in crio.yaml; no privileged, hostNetwork/IPC/PID, SYS_ADMIN, or allowPrivilegeEscalation settings were added.
No-Sensitive-Data-In-Logs ✅ Passed Touched YAML only updates CRI-O annotation allowlists; no passwords, tokens, PII, internal hostnames, or sensitive logs were added.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly summarizes the main change: migrating deprecated CRI-O annotations to the v2 format.
✨ 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 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:

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 Jul 27, 2026
@saschagrunert

Copy link
Copy Markdown
Member Author

/retest

@openshift-ci

openshift-ci Bot commented Jul 27, 2026

Copy link
Copy Markdown
Contributor

@saschagrunert: all tests passed!

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.

@isabella-janssen

Copy link
Copy Markdown
Member

/hold

Holding to allow the Kube rebase to land in #6321. Please ensure this will not cause merge conflicts for the Kube rebase before unholding this PR.

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 28, 2026
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. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants