Uh oh!
There was an error while loading. Please reload this page.
🐛 OCPBUGS-60963: fix crdUpgradeSafety reporting OneOf changes as unhandled - #2759
Conversation
✅ Deploy Preview for olmv1 ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
There was a problem hiding this comment.
Pull request overview
This PR updates the CRD upgrade safety preflight to correctly classify oneOf-related schema changes, avoiding generic “unhandled changes found” errors that can block legitimate operator upgrades. It does this by bumping the sigs.k8s.io/crdify dependency to a newer commit that adds a dedicated oneOf validator, and by adjusting/adding unit tests to assert the new error categorization.
Changes:
- Bump
sigs.k8s.io/crdifyto a newer pseudo-version that includesoneOfvalidation support. - Update an existing CRD upgrade test to expect a
oneOf-scoped error instead ofunhandled. - Add new unit tests and CRD manifest fixtures covering
oneOfremoval andoneOfaddition scenarios.
Reviewed changes
Copilot reviewed 6 out of 7 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| internal/operator-controller/rukpak/preflights/crdupgradesafety/testdata/manifests/crd-oneof-safe-addition-old.json | Adds CRD fixture representing the “before” state without oneOf. |
| internal/operator-controller/rukpak/preflights/crdupgradesafety/testdata/manifests/crd-oneof-safe-addition-new.json | Adds CRD fixture representing the “after” state with a new oneOf constraint. |
| internal/operator-controller/rukpak/preflights/crdupgradesafety/testdata/manifests/crd-oneof-removed-old.json | Adds CRD fixture representing the “before” state with oneOf. |
| internal/operator-controller/rukpak/preflights/crdupgradesafety/testdata/manifests/crd-oneof-removed-new.json | Adds CRD fixture representing the “after” state where oneOf is removed. |
| internal/operator-controller/rukpak/preflights/crdupgradesafety/crdupgradesafety_test.go | Updates expectations and adds targeted tests for oneOf validator behavior. |
| go.mod | Pins sigs.k8s.io/crdify to the newer pseudo-version containing the oneOf validator. |
| go.sum | Updates checksums to match the new crdify version. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
OneOf schema changes (e.g. adding required-field constraints) were falling back to the generic "unhandled" comparator, blocking legitimate operator upgrades like Serverless Operator 1.35.0 to 1.36.0. Pin sigs.k8s.io/crdify to latest master (bb9957dbf465) which includes a dedicated oneOf validator. Co-Authored-By: Claude <noreply@anthropic.com>
tmshort
commented
Jun 11, 2026
/approve |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: tmshort The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@## main #2759 +/- ##
==========================================
- Coverage 66.97% 66.89% -0.08%
==========================================
Files 149 149 Lines 11382 11382 ==========================================
- Hits 7623 7614 -9 - Misses 3206 3213 +7 - Partials 553 555 +2
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
pedjak
commented
Jun 11, 2026
/jira refresh |
perdasilva
commented
Jun 11, 2026
/lgtm |
79f6c2a
into
operator-framework:mainUh oh!
There was an error while loading. Please reload this page.
Description
CRD upgrade safety checks reported OneOf schema changes as generic
"unhandled changes found" errors, blocking legitimate operator upgrades
(e.g. Serverless Operator 1.35.0 → 1.36.0).
Fixed by updating
sigs.k8s.io/crdifyto the latest master (bb9957dbf465)which includes a dedicated
oneOfvalidator(kubernetes-sigs/crdify#54)
that properly categorizes OneOf changes (constraint added, removed, subschemas modified).
Changes
sigs.k8s.io/crdifyto latest master (v0.6.1-0.20260602124154-bb9957dbf465)unhandledtooneOferrorReviewer Checklist