⚠️ OPRUN-4518: chore(Boxcutter): Rename ClusterExtensionRevision to ClusterObjectSet by camilamacedo86 · Pull Request #2589 · operator-framework/operator-controller

camilamacedo86 · 2026-03-25T06:09:37Z

No description provided.

netlify · 2026-03-25T06:09:43Z

✅ Deploy Preview for olmv1 ready!

Name	Link
🔨 Latest commit	`88a025d`
🔍 Latest deploy log	https://app.netlify.com/projects/olmv1/deploys/69ca85ac36e3b3000823aa8e
😎 Deploy Preview	https://deploy-preview-2589--olmv1.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

Copilot

Pull request overview

This PR renames the experimental Boxcutter “revision” CRD and its related plumbing from ClusterExtensionRevision to ObjectSet, updating the operator-controller codebase, Helm manifests/CRDs, apply-configurations, and e2e coverage to match the new API naming.

Changes:

Renames controller/applier code paths, constants, and types to ObjectSet (including Boxcutter reconciliation/status mirroring).
Updates Helm RBAC and experimental CRD manifests to use objectsets.olm.operatorframework.io.
Updates e2e steps/features and generated apply-configurations/docs to use ObjectSet.

Reviewed changes

Copilot reviewed 49 out of 51 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
test/e2e/steps/testdata/rbac-template-for-all-extensions.yaml	Updates RBAC resources/comments from clusterextensionrevisions to objectsets.
test/e2e/steps/testdata/pvc-probe-sa-boxcutter-rbac-template.yaml	Updates finalizer RBAC to objectsets/finalizers.
test/e2e/steps/testdata/olm-sa-boxcutter-rbac-template.yaml	Updates RBAC comment/resources to objectsets/finalizers.
test/e2e/steps/steps.go	Renames step definitions and resource lookups to ObjectSet.
test/e2e/steps/hooks.go	Scenario context + cleanup updated to track/delete ObjectSets.
test/e2e/features/update.feature	Updates scenarios to assert ObjectSet conditions/archival.
test/e2e/features/status.feature	Updates revision-condition assertions to ObjectSet.
test/e2e/features/revision.feature	Renames feature + scenarios for directly applying ObjectSet.
test/e2e/features/install.feature	Updates progress-deadline and annotation/label checks to ObjectSet.
test/e2e/README.md	Updates `${CER_NAME}` description to refer to ObjectSet.
internal/shared/util/test/artifacts.go	Collects ObjectSet artifacts instead of ClusterExtensionRevision artifacts.
internal/operator-controller/labels/labels.go	Updates label/annotation docs to refer to ObjectSet.
internal/operator-controller/controllers/revision_engine_factory.go	Updates factory interface to accept `*ocv1.ObjectSet`.
internal/operator-controller/controllers/objectset_controller_test.go	Renames reconciler tests/types to ObjectSet.
internal/operator-controller/controllers/objectset_controller_internal_test.go	Renames internal controller tests/helpers to ObjectSet.
internal/operator-controller/controllers/objectset_controller.go	Renames reconciler and RBAC markers to objectsets resources.
internal/operator-controller/controllers/common_controller_test.go	Updates condition type/reason constants used in tests.
internal/operator-controller/controllers/common_controller.go	Updates failure detection to use ObjectSet Progressing/Retrying.
internal/operator-controller/controllers/clusterextension_reconcile_steps.go	Updates comment referencing maintained revision storage to ObjectSet.
internal/operator-controller/controllers/boxcutter_reconcile_steps.go	Updates revision listing/sorting and condition mirroring to ObjectSet.
internal/operator-controller/applier/phase_test.go	Updates applyconfiguration types used in phase sorting tests.
internal/operator-controller/applier/phase.go	Renames comparator + phase sorting to ObjectSet applyconfiguration types.
internal/operator-controller/applier/boxcutter_test.go	Updates generator expectations, retention const name, and mocks to ObjectSet.
internal/operator-controller/applier/boxcutter.go	Renames generator interface/retention const and migrator/storage to ObjectSet.
helm/olmv1/templates/rbac/clusterrole-operator-controller-manager-role.yml	Updates manager RBAC resources to objectsets (+status/+finalizers).
helm/olmv1/templates/crds/customresourcedefinition-objectsets.olm.operatorframework.io.yml	Points Helm CRD template at objectsets CRD file.
helm/olmv1/base/operator-controller/crd/experimental/olm.operatorframework.io_objectsets.yaml	CRD renamed/rewritten to define ObjectSet kind/plural/singular.
helm/olmv1/base/operator-controller/crd/experimental/olm.operatorframework.io_clusterextensions.yaml	Updates ClusterExtension CRD descriptions referencing active revisions to ObjectSets.
hack/tools/update-crds.sh	Updates generated CRD filename variable to `olm.operatorframework.io_objectsets.yaml`.
docs/api-reference/olmv1-api-reference.md	Updates API reference text to ObjectSet terminology.
docs/api-reference/crd-ref-docs-gen-config.yaml	Updates ignored types list to ObjectSet/ObjectSetList.
config/samples/olm_v1_clusterextension.yaml	Updates sample RBAC to objectsets/finalizers and comment text.
cmd/operator-controller/main.go	Updates cache/controller wiring to own/cache `ocv1.ObjectSet`.
applyconfigurations/utils.go	Replaces ClusterExtensionRevision applyconfig mapping with ObjectSet mapping.
applyconfigurations/api/v1/revisionstatus.go	Updates comments/fields to reference ObjectSet.
applyconfigurations/api/v1/objectsetstatus.go	Adds generated apply-configuration type for ObjectSetStatus.
applyconfigurations/api/v1/objectsetspec.go	Updates generated apply-configuration type for ObjectSetSpec.
applyconfigurations/api/v1/objectsetphase.go	Updates generated apply-configuration type for ObjectSetPhase.
applyconfigurations/api/v1/objectsetobject.go	Updates generated apply-configuration type for ObjectSetObject.
applyconfigurations/api/v1/objectset.go	Updates generated apply-configuration type for ObjectSet.
applyconfigurations/api/v1/clusterextensionstatus.go	Updates ClusterExtensionStatus applyconfig comments to reference ObjectSets.
applyconfigurations/api/v1/clusterextensionrevisionstatus.go	Removes generated ClusterExtensionRevisionStatus apply-configuration.
api/v1/zz_generated.deepcopy.go	Updates generated deepcopy implementations for ObjectSet types.
api/v1/validation_test.go	Updates validation tests to use ObjectSetSpec/ObjectSet.
api/v1/objectset_types_test.go	Renames ObjectSet validity/immutability tests from ClusterExtensionRevision.
api/v1/objectset_types.go	Renames the API type definitions/constants to ObjectSet.
api/v1/clusterextension_types.go	Updates ClusterExtension status/docs to reference ObjectSets.
AGENTS.md	Updates repo documentation to name ObjectSet as the experimental revision CRD.
.claude/commands/list-e2e-steps.md	Renames step category from ClusterExtensionRevision to ObjectSet.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

internal/shared/util/test/artifacts.go

camilamacedo86 · 2026-03-25T06:29:04Z

We can

/override go-apidif

The issues are expected
It is in techpreview

openshift-ci · 2026-03-25T06:29:09Z

@camilamacedo86: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

go-apidif

Only the following failed contexts/checkruns were expected:

Verify PR title
crd-diff
e2e
experimental-e2e
extension-developer-e2e
go-apidiff
go-verdiff
goreleaser
lint
netlify/olmv1/deploy-preview
st2ex-e2e
tide
unit-test-basic
upgrade-st2st-e2e
verify

If you are trying to override a checkrun that has a space in it, you must put a double quote on the context.

Details

In response to this:

We can

/override go-apidif

The issues are expected
It is in techpreview

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.

codecov · 2026-03-25T06:29:33Z

Codecov Report

❌ Patch coverage is 75.15723% with 79 lines in your changes missing coverage. Please review.
✅ Project coverage is 68.86%. Comparing base (7145047) to head (88a025d).
⚠️ Report is 2 commits behind head on main.

Files with missing lines	Patch %	Lines
api/v1/zz_generated.deepcopy.go	60.31%	25 Missing ⚠️
applyconfigurations/api/v1/clusterobjectset.go	57.69%	11 Missing ⚠️
applyconfigurations/utils.go	0.00%	10 Missing ⚠️
...plyconfigurations/api/v1/clusterobjectsetstatus.go	0.00%	8 Missing ⚠️
...troller/controllers/clusterobjectset_controller.go	92.30%	3 Missing and 5 partials ⚠️
internal/shared/util/test/artifacts.go	0.00%	8 Missing ⚠️
internal/operator-controller/applier/boxcutter.go	92.85%	3 Missing and 1 partial ⚠️
...plyconfigurations/api/v1/clusterobjectsetobject.go	60.00%	2 Missing ⚠️
cmd/operator-controller/main.go	60.00%	2 Missing ⚠️
...pplyconfigurations/api/v1/clusterobjectsetphase.go	80.00%	1 Missing ⚠️

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #2589   +/-   ##
=======================================
  Coverage   68.86%   68.86%           
=======================================
  Files         139      139           
  Lines        9872     9872           
=======================================
  Hits         6798     6798           
  Misses       2557     2557           
  Partials      517      517

Flag	Coverage Δ
e2e	`37.73% <6.66%> (+0.28%)`	⬆️
experimental-e2e	`52.43% <74.66%> (+0.02%)`	⬆️
unit	`53.51% <47.79%> (+0.01%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

camilamacedo86 · 2026-03-25T06:29:58Z

We can

/override go-apidif/go-apidif

The issues are expected
It is in techpreview

openshift-ci · 2026-03-25T06:30:02Z

@camilamacedo86: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

go-apidif/go-apidif

Only the following failed contexts/checkruns were expected:

Verify PR title
crd-diff
e2e
experimental-e2e
extension-developer-e2e
go-apidiff
go-verdiff
goreleaser
lint
netlify/olmv1/deploy-preview
st2ex-e2e
tide
unit-test-basic
upgrade-st2st-e2e
verify

If you are trying to override a checkrun that has a space in it, you must put a double quote on the context.

Details

In response to this:

We can

/override go-apidif/go-apidif

The issues are expected
It is in techpreview

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.

camilamacedo86 · 2026-03-25T06:30:29Z

We can

/override api-diff-lint/api-diff-lint

The issues are expected
It is in techpreview

openshift-ci · 2026-03-25T06:30:34Z

@camilamacedo86: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

api-diff-lint/api-diff-lint

Only the following failed contexts/checkruns were expected:

Verify PR title
crd-diff
e2e
experimental-e2e
extension-developer-e2e
go-apidiff
go-verdiff
goreleaser
lint
netlify/olmv1/deploy-preview
st2ex-e2e
tide
unit-test-basic
upgrade-st2st-e2e
verify

If you are trying to override a checkrun that has a space in it, you must put a double quote on the context.

Details

In response to this:

We can

/override api-diff-lint/api-diff-lint

The issues are expected
It is in techpreview

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.

camilamacedo86 · 2026-03-25T06:30:40Z

We can

/override api-diff-lint

The issues are expected
It is in techpreview

openshift-ci · 2026-03-25T06:30:45Z

@camilamacedo86: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

api-diff-lint

Only the following failed contexts/checkruns were expected:

Verify PR title
crd-diff
e2e
experimental-e2e
extension-developer-e2e
go-apidiff
go-verdiff
goreleaser
lint
netlify/olmv1/deploy-preview
st2ex-e2e
tide
unit-test-basic
upgrade-st2st-e2e
verify

If you are trying to override a checkrun that has a space in it, you must put a double quote on the context.

Details

In response to this:

We can

/override api-diff-lint

The issues are expected
It is in techpreview

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.

camilamacedo86 · 2026-03-25T06:31:07Z

/override go-apidiff

openshift-ci · 2026-03-25T06:31:12Z

@camilamacedo86: Overrode contexts on behalf of camilamacedo86: go-apidiff

Details

In response to this:

/override go-apidiff

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.

camilamacedo86 · 2026-03-25T06:32:32Z

/label api-diff-lint-override

openshift-ci · 2026-03-25T06:32:35Z

@camilamacedo86: The label(s) /label api-diff-lint-override cannot be applied. These labels are supported: acknowledge-critical-fixes-only, platform/aws, platform/azure, platform/baremetal, platform/google, platform/libvirt, platform/openstack, ga, tide/merge-method-merge, tide/merge-method-rebase, tide/merge-method-squash, px-approved, docs-approved, qe-approved, ux-approved, no-qe, rebase/manual, cluster-config-api-changed, run-integration-tests, approved, backport-risk-assessed, bugzilla/valid-bug, cherry-pick-approved, jira/valid-bug, ok-to-test, stability-fix-approved, staff-eng-approved. Is this label configured under labels -> additional_labels or labels -> restricted_labels in plugin.yaml?

Details

In response to this:

/label api-diff-lint-override

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.

tmshort · 2026-03-25T13:37:03Z

Is there a ticket associated with this (OPRUN-4518)?

tmshort · 2026-03-25T13:44:32Z

The /override command only works for non-required tests.

camilamacedo86 · 2026-03-25T16:18:24Z

@tmshort

Thank you for looking on that.
Regards:

Is there a ticket associated with this (OPRUN-4518)?

Yes, it is the ticket.

camilamacedo86 · 2026-03-26T09:45:14Z

@perdasilva @pedjak @dtfranz

We have this task to finish boxcutter
Could you please help us out get this merged?

perdasilva · 2026-03-30T15:24:53Z

/approve

openshift-ci · 2026-03-30T15:25:00Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: perdasilva

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:

~~OWNERS~~ [perdasilva]

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

…t in OTE tests Update all remaining references to ClusterExtensionRevision in openshift/tests-extension to use ClusterObjectSet, matching the upstream rename in operator-framework/operator-controller#2589. Files updated: - test/qe/specs/olmv1_ce.go: RBAC resource names and comments - test/olmv1-preflight.go: scenario constants, test names, RBAC rules - .openshift-tests-extension/openshift_payload_olmv1.json: test name - pkg/bindata/qe/bindata.go: embedded RBAC templates - test/qe/testdata/olm/sa-nginx-limited-boxcutter.yaml: RBAC resources - test/qe/testdata/olm/sa-nginx-insufficient-operand-rbac-boxcutter.yaml: RBAC resources Signed-off-by: Camila Macedo <cmacedo@redhat.com> Made-with: Cursor

…s ClusterObjectSet The upstream rename of ClusterExtensionRevision to ClusterObjectSet (operator-framework/operator-controller#2589) breaks the incompatible operator detection in cluster-olm-operator. The cluster-olm-operator binary still reads ClusterExtensionRevision resources to find operators with olm.maxOpenShiftVersion, so after the rename it never detects incompatible operators and InstalledOLMOperatorsUpgradeable stays True. Skip this test when NewOLMBoxCutterRuntime feature gate is enabled until cluster-olm-operator is updated to read ClusterObjectSet. Signed-off-by: Camila Macedo <cmacedo@redhat.com> Made-with: Cursor