Skip to content

OPRUN-4518: Rename ClusterExtensionRevision to ClusterObjectSet#191

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
camilamacedo86:rename
Apr 1, 2026
Merged

OPRUN-4518: Rename ClusterExtensionRevision to ClusterObjectSet#191
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
camilamacedo86:rename

Conversation

@camilamacedo86
Copy link
Copy Markdown
Contributor

No description provided.

@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Mar 31, 2026

@camilamacedo86: This pull request references OPRUN-4518 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

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.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Mar 31, 2026
@openshift-ci openshift-ci bot requested review from dtfranz and grokspawn March 31, 2026 16:56
@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Mar 31, 2026

Walkthrough

Replaces uses of ClusterExtensionRevision with ClusterObjectSet across clients, controller logic, RBAC, tests, and operator wiring; the incompatible-operator controller now derives metadata from ClusterObjectSet resources instead of ClusterExtensionRevision resources.

Changes

Cohort / File(s) Summary
Client refactoring
pkg/clients/clients.go
Replaced ClusterExtensionRevisionClient with ClusterObjectSetClient; constructor and informer wiring now target the clusterobjectsets GVR and start the corresponding dynamic informer.
Controller implementation
pkg/controller/incompatible_operator_controller.go
Controller constructor and stored dependency switched to ClusterObjectSetClient; incompatibility lookup renamed and reworked to list/select ClusterObjectSets by owner label and filter by spec.lifecycleState == Active.
Controller tests
pkg/controller/incompatible_operator_controller_test.go
Test fixtures and helpers updated to create ClusterObjectSet unstructured objects; dynamic fake client, informer indexers, and controller instantiation use clusterObjectSets.
Operator setup
cmd/cluster-olm-operator/main.go
runOperator now passes cl.ClusterObjectSetClient to controller.NewIncompatibleOperatorController instead of the revision client.
RBAC permissions
manifests/0000_51_olm_02_operator_clusterrole.yaml
ClusterRole rule resource changed from clusterextensionrevisions to clusterobjectsets (verbs remain get, list, watch).

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~25 minutes

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

Copy link
Copy Markdown

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@pkg/controller/incompatible_operator_controller.go`:
- Around line 50-82: The controller currently only registers operatorClient and
clusterExtensionClient informers but uses ClusterObjectSet data in sync(), so
add the ClusterObjectSet informer to NewIncompatibleOperatorController by
passing clusterObjectSetClient.Informer().Informer() into
factory.New().WithInformers(...). If ClusterObjectSet is behind the feature
gate, guard adding that informer with featureGate.Enabled(...) (using the same
featureGate parameter) so the informer is only registered when the feature is
enabled; update the WithInformers argument list accordingly in
NewIncompatibleOperatorController.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 18418c3c-5877-4f49-aa5d-72212788fb04

📥 Commits

Reviewing files that changed from the base of the PR and between fe51add and fc2eeb9.

📒 Files selected for processing (5)
  • cmd/cluster-olm-operator/main.go
  • manifests/0000_51_olm_02_operator_clusterrole.yaml
  • pkg/clients/clients.go
  • pkg/controller/incompatible_operator_controller.go
  • pkg/controller/incompatible_operator_controller_test.go
✅ Files skipped from review due to trivial changes (1)
  • pkg/controller/incompatible_operator_controller_test.go
🚧 Files skipped from review as they are similar to previous changes (2)
  • cmd/cluster-olm-operator/main.go
  • pkg/clients/clients.go

@tmshort
Copy link
Copy Markdown
Contributor

tmshort commented Mar 31, 2026

I'm concerned about the rename. I suspect that we will end up breaking techpreview, devpreview, and customnoupgrade. And will have to force it in.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Mar 31, 2026

@tmshort: it appears that you have attempted to use some version of the payload command, but your comment was incorrectly formatted and cannot be acted upon. See the docs for usage info.

5 similar comments
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Mar 31, 2026

@tmshort: it appears that you have attempted to use some version of the payload command, but your comment was incorrectly formatted and cannot be acted upon. See the docs for usage info.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Mar 31, 2026

@tmshort: it appears that you have attempted to use some version of the payload command, but your comment was incorrectly formatted and cannot be acted upon. See the docs for usage info.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Mar 31, 2026

@tmshort: it appears that you have attempted to use some version of the payload command, but your comment was incorrectly formatted and cannot be acted upon. See the docs for usage info.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Mar 31, 2026

@tmshort: it appears that you have attempted to use some version of the payload command, but your comment was incorrectly formatted and cannot be acted upon. See the docs for usage info.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Mar 31, 2026

@tmshort: it appears that you have attempted to use some version of the payload command, but your comment was incorrectly formatted and cannot be acted upon. See the docs for usage info.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Mar 31, 2026

@tmshort: 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-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/41148420-2d3b-11f1-8a55-a6f097e8a2f8-0

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Mar 31, 2026

@tmshort: it appears that you have attempted to use some version of the payload command, but your comment was incorrectly formatted and cannot be acted upon. See the docs for usage info.

5 similar comments
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Mar 31, 2026

@tmshort: it appears that you have attempted to use some version of the payload command, but your comment was incorrectly formatted and cannot be acted upon. See the docs for usage info.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Mar 31, 2026

@tmshort: it appears that you have attempted to use some version of the payload command, but your comment was incorrectly formatted and cannot be acted upon. See the docs for usage info.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Mar 31, 2026

@tmshort: it appears that you have attempted to use some version of the payload command, but your comment was incorrectly formatted and cannot be acted upon. See the docs for usage info.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Mar 31, 2026

@tmshort: it appears that you have attempted to use some version of the payload command, but your comment was incorrectly formatted and cannot be acted upon. See the docs for usage info.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Mar 31, 2026

@tmshort: it appears that you have attempted to use some version of the payload command, but your comment was incorrectly formatted and cannot be acted upon. See the docs for usage info.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Mar 31, 2026

@tmshort: 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-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/74cf0dbc-2d3b-11f1-9bff-7a440c1b998b-0

@tmshort
Copy link
Copy Markdown
Contributor

tmshort commented Mar 31, 2026

The devpreview and techpreview tests are likely failing due to openshift/operator-framework-operator-controller#682 not having merged.

@tmshort
Copy link
Copy Markdown
Contributor

tmshort commented Mar 31, 2026

/approve

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Mar 31, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: camilamacedo86, tmshort

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 Mar 31, 2026
@camilamacedo86
Copy link
Copy Markdown
Contributor Author

/retest-required

@camilamacedo86 camilamacedo86 changed the title OPRUN-4518: Rename ClusterExtensionRevision to ClusterObjectSet OPRUN-4518: Remove skip for incompatible operator check after rename of CER Apr 1, 2026
@camilamacedo86 camilamacedo86 changed the title OPRUN-4518: Remove skip for incompatible operator check after rename of CER OPRUN-4518: Rename ClusterExtensionRevision to ClusterObjectSet Apr 1, 2026
@dtfranz
Copy link
Copy Markdown
Contributor

dtfranz commented Apr 1, 2026

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 1, 2026
@bandrade
Copy link
Copy Markdown

bandrade commented Apr 1, 2026

/label qe-approved
/verified by @bandrade

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Apr 1, 2026
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Apr 1, 2026

@camilamacedo86: This pull request references OPRUN-4518 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

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.

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Apr 1, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@bandrade: This PR has been marked as verified by @bandrade.

Details

In response to this:

/label qe-approved
/verified by @bandrade

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.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 1, 2026

@camilamacedo86: all tests passed!

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.

@openshift-merge-bot openshift-merge-bot bot merged commit ef265b9 into openshift:main Apr 1, 2026
12 checks passed
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/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants