Skip to content

OCPBUGS-111648: crio: drop criu support - #6412

Open
haircommander wants to merge 1 commit into
openshift:mainfrom
haircommander:drop-criu
Open

OCPBUGS-111648: crio: drop criu support#6412
haircommander wants to merge 1 commit into
openshift:mainfrom
haircommander:drop-criu

Conversation

@haircommander

@haircommander haircommander commented Aug 17, 2026

Copy link
Copy Markdown
Member

for one, it doesn't work with crun, which has been the default for a while. Also, upstream will be deprecating support And finally, there are some policy and security issues with the current implementation

Summary by CodeRabbit

  • New Features
    • Added container checkpoint and restore support for master and worker nodes, limited to checkpoint operations.
  • Configuration
    • Preserved crun as the default container runtime for worker nodes.
    • Reorganized worker runtime settings for consistent configuration.

@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 Aug 17, 2026

Copy link
Copy Markdown

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 107394db-1427-490b-85bc-d6ce540f1627

📥 Commits

Reviewing files that changed from the base of the PR and between 58020ed and d7a245f.

📒 Files selected for processing (2)
  • templates/master/01-master-container-runtime/_base/files/crio.yaml
  • templates/worker/01-worker-container-runtime/_base/files/crio.yaml

Included review availability: Your plan provides up to 12 included reviews per hour; 11 remain after this review.


Walkthrough

The CRI-O master and worker configurations add checkpoint-restore settings with container-level support limited to checkpoint operations. The worker configuration reorders the existing crun runtime setting without changing its value.

Changes

CRI-O runtime configuration

Layer / File(s) Summary
Checkpoint-restore settings and worker runtime ordering
templates/master/01-master-container-runtime/_base/files/crio.yaml, templates/worker/01-worker-container-runtime/_base/files/crio.yaml
Both configurations add [crio.checkpoint_restore] with container_level_enabled = "checkpoint_only". The worker configuration moves default_runtime = "crun" before existing logging, cgroup, and sysctl settings.

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

Merge Risk: ⚪ Minimal · up to d7a24

This localized change updates the worker and master CRI-O templates to drop CRIU support. No actionable merge-blocking risk remains in the supplied evidence, so it is merge-ready after normal checks.

Suggested reviewers: hasan4791, qiwang19

🚥 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 changes only two CRI-O YAML templates. The diff adds configuration and reorders a setting; it changes no Ginkgo test titles or test source.
Test Structure And Quality ✅ Passed The parent-to-HEAD diff changes only two CRI-O YAML files and no Ginkgo test code, so the listed test-quality requirements do not apply.
Microshift Test Compatibility ✅ Passed The pull request changes only two CRI-O YAML templates; the parent-to-HEAD diff adds no Ginkgo tests or test files, so MicroShift test compatibility is not applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed The pull request changes only two CRI-O YAML templates; the verified diff adds no Ginkgo e2e tests or multi-node test assumptions.
Topology-Aware Scheduling Compatibility ✅ Passed The diff changes only CRI-O configuration templates; it adds checkpoint settings and reorders a runtime key, with no deployment, controller, or scheduling constraints.
Ote Binary Stdout Contract ✅ Passed The PR diff changes only two CRI-O YAML templates; it does not change OTE binaries or process-level stdout handling.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed The diff changes only two CRI-O YAML templates and adds no Ginkgo tests, IPv4 assumptions, or external connectivity requirements.
No-Weak-Crypto ✅ Passed The HEAD^..HEAD patch only reorders default_runtime and adds CRI-O checkpoint_restore settings; no weak algorithms, custom crypto, or secret comparisons were introduced.
Container-Privileges ✅ Passed The diff only adds CRI-O checkpoint_restore settings and reorders existing default_runtime; it adds no privileged, host namespace, SYS_ADMIN, root, or allowPrivilegeEscalation manifest setting.
No-Sensitive-Data-In-Logs ✅ Passed The diff only adds CRI-O checkpoint settings and reorders default_runtime; it adds no logging directives or sensitive values.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly identifies the main change: removing CRIU support from the CRI-O configuration.
✨ 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 Aug 17, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander

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 Aug 17, 2026
@openshift-ci
openshift-ci Bot requested review from QiWang19 and hasan4791 August 17, 2026 16:46
@haircommander

Copy link
Copy Markdown
Member Author

/cherry-pick release-5.0

@openshift-cherrypick-robot

Copy link
Copy Markdown

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

Details

In response to this:

/cherry-pick release-5.0

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.

@haircommander

Copy link
Copy Markdown
Member Author

/hold

we may take a slightly different approach

@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 Aug 17, 2026
for one, it doesn't work with crun, which has been the default for a while. Also, upstream will be deprecating support
And finally, there are some policy and security issues with the current implementation

Maintain support for checkpointing as it's an official upstream feature and we have some usage downstream.
Restore specifically was bolted on top of kubernetes and was more experimental than a supported feature

Signed-off-by: Peter Hunt <pehunt@redhat.com>
@haircommander haircommander changed the title crio: drop criu support OCPBUGS-111648: crio: drop criu support Aug 19, 2026
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Aug 19, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@haircommander: This pull request references Jira Issue OCPBUGS-111648, which is invalid:

  • expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is MODIFIED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

for one, it doesn't work with crun, which has been the default for a while. Also, upstream will be deprecating support And finally, there are some policy and security issues with the current implementation

Summary by CodeRabbit

  • Bug Fixes
  • Disabled CRIU support in container runtime configuration for master and worker nodes.
  • Ensured crun remains the default runtime for worker nodes.

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 openshift-eng/jira-lifecycle-plugin repository.

@haircommander

Copy link
Copy Markdown
Member Author

/unhold

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 19, 2026
@haircommander

Copy link
Copy Markdown
Member Author

/retest

@openshift-ci

openshift-ci Bot commented Aug 19, 2026

Copy link
Copy Markdown
Contributor

@haircommander: 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/perfscale-control-plane-6nodes d7a245f link false /test perfscale-control-plane-6nodes

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

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants