🐛 Upgrade boxcutter to v0.13.1 and remove collision detection workaround#2637
Conversation
Boxcutter v0.13.1 includes the fix from package-operator/boxcutter#501 which ensures collision detection runs before revision linearity checks. This allows us to remove the foreignRevisionController workaround that was manually detecting ActionProgressed objects owned by foreign ClusterExtensions. Assisted-by: Claude
✅ Deploy Preview for olmv1 ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
camilamacedo86
changed the title
There was a problem hiding this comment.
Pull request overview
Upgrades the Boxcutter dependency to v0.13.1 to rely on upstream collision detection ordering fixes, allowing removal of a local workaround that manually detected collisions for foreign ClusterObjectSet ownership.
Changes:
- Bump
pkg.package-operator.run/boxcutterto v0.13.1 (and associated module sums). - Remove the “foreign revision controller” collision-detection workaround from the ClusterObjectSet reconciler.
- Update the foreign-collision unit test to expect
ActionCollisionrather thanActionProgressed.
Reviewed changes
Copilot reviewed 4 out of 5 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| internal/operator-controller/controllers/revision_engine_factory.go | Updates Boxcutter object engine construction to match the newer Boxcutter API. |
| internal/operator-controller/controllers/clusterobjectset_controller.go | Removes sibling-listing + foreign-owner workaround and relies on Boxcutter’s collision reporting. |
| internal/operator-controller/controllers/clusterobjectset_controller_test.go | Adjusts the foreign-collision test to assert collision behavior via ActionCollision. |
| go.mod | Bumps Boxcutter to v0.13.1 (and also bumps a couple k8s module versions). |
| go.sum | Updates checksums for Boxcutter v0.13.1 and fxamacker/cbor v2.9.1. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #2637 +/- ##
==========================================
- Coverage 68.97% 68.91% -0.07%
==========================================
Files 139 139
Lines 9891 9862 -29
==========================================
- Hits 6822 6796 -26
+ Misses 2561 2559 -2
+ Partials 508 507 -1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
/approve |
openshift-ci
bot
added
the
approved
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: rashmigottipati, 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 |
openshift-merge-bot
bot
merged commit b6dfd40
into
operator-framework:main
Boxcutter v0.13.1 includes the fix from package-operator/boxcutter#501 which ensures collision detection runs before revision linearity checks.
This allows us to remove the foreignRevisionController workaround that was manually detecting ActionProgressed objects owned by foreign ClusterExtensions.