[DRAFT] Revert: Add additional storage configuration support for CRI-O

[smg247]

Experimental Revert PR

This is an experimental draft revert of PR #5666 to test its contribution to upgrade failures.

Context

• Original PR: OCPNODE-4074: Add additional storage configuration support for CRI-O #5666 - "Add additional storage configuration support for CRI-O"
• Confidence Score: 55 (medium-confidence candidate below automated threshold)
• Rationale: MCO change landing in same payload as feature gate removal. Azure upgrade job shows machine-config operator upgrade failures. Could contribute to MCO instability during upgrades but less directly correlated than the feature gate removal.

Failing Payload

• Payload Tag: 4.22.0-0.ci-2026-03-17-030533
• Version: 4.22
• Stream: ci
• Architecture: amd64
• Release Controller URL: https://amd64.ocp.releases.ci.openshift.org/releasestream/4.22.0-0.ci/release/4.22.0-0.ci-2026-03-17-030533

Failing Job

• Job: aggregated-azure-ovn-upgrade-4.22-minor-release-openshift-release-analysis-aggregator
• Prow URL: https://prow.ci.openshift.org/view/gs/test-platform-results/logs/aggregated-azure-ovn-upgrade-4.22-minor-release-openshift-release-analysis-aggregator/2033818167943368704
• Underlying Job: periodic-ci-openshift-release-main-ci-4.22-upgrade-from-stable-4.21-e2e-azure-ovn-upgrade

Next Steps

1. Payload job will be triggered to test if reverting this PR resolves the upgrade failures
2. If tests pass: This draft will be promoted to a full revert PR
3. If tests fail: This PR will be closed as the original PR is innocent

---

Status: Awaiting payload test results

[openshift-ci]

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

[smg247]

/payload-job periodic-ci-openshift-release-main-ci-4.22-upgrade-from-stable-4.21-e2e-azure-ovn-upgrade

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: smg247
Once this PR has been reviewed and has the lgtm label, please assign dkhater-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:

• OWNERS

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

[openshift-ci]

@smg247: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

• periodic-ci-openshift-release-main-ci-4.22-upgrade-from-stable-4.21-e2e-azure-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/6b824ce0-21fd-11f1-80f2-ac485e036d20-0

[coderabbitai]

Important

Review skipped

Auto reviews are limited based on label configuration.

🚫 Review skipped — only excluded labels are configured. (1)

• do-not-merge/work-in-progress

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: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 27f456ba-ad75-476a-ae27-7cca9bf2c4e7

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

---

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

[smg247]

/payload-aggregate periodic-ci-openshift-release-main-ci-4.22-e2e-aws-ovn-upgrade 3

[openshift-ci]

@smg247: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

• periodic-ci-openshift-release-main-ci-4.22-e2e-aws-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/c50c82d0-21fd-11f1-920d-9cc44152c05b-0

[smg247]

/payload-aggregate periodic-ci-openshift-release-main-ci-4.22-e2e-gcp-ovn-upgrade 3

[openshift-ci]

@smg247: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

• periodic-ci-openshift-release-main-ci-4.22-e2e-gcp-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/cabf1940-21fd-11f1-9409-076ec2653b7a-0

[smg247]

/payload-aggregate periodic-ci-openshift-release-main-ci-4.22-upgrade-from-stable-4.21-e2e-azure-ovn-upgrade 5

[openshift-ci]

@smg247: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

• periodic-ci-openshift-release-main-ci-4.22-upgrade-from-stable-4.21-e2e-azure-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/1f95ca80-2204-11f1-8cd6-a969402495aa-0

[smg247]

/payload-aggregate periodic-ci-openshift-release-main-ci-4.22-e2e-aws-ovn-upgrade 5

[smg247]

/payload-aggregate periodic-ci-openshift-release-main-ci-4.22-e2e-gcp-ovn-upgrade 5

[openshift-ci]

@smg247: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

• periodic-ci-openshift-release-main-ci-4.22-e2e-gcp-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/af73a000-2204-11f1-9e07-119d90763903-0

[openshift-ci]

@smg247: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

• periodic-ci-openshift-release-main-ci-4.22-e2e-aws-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/ae059110-2204-11f1-82fd-2eff4896806a-0

[smg247]

/close this was not the cause

[openshift-merge-robot]

PR needs rebase.

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.