Skip to content

OCPCLOUD-3319: Simplify RelatedObjects on the cluster-api ClusterOperator#497

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
openshift-cloud-team:related-objects
Mar 25, 2026
Merged

OCPCLOUD-3319: Simplify RelatedObjects on the cluster-api ClusterOperator#497
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
openshift-cloud-team:related-objects

Conversation

@mdbooth
Copy link
Copy Markdown
Contributor

@mdbooth mdbooth commented Mar 20, 2026

RelatedObject is an input to must-gather. must-gather already fetches most
namespaced objects when the namespace is specified, so we remove those.

We were also missing the VAPs and the new crd compatibility namespace.

@openshift-ci-robot
Copy link
Copy Markdown

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

@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 20, 2026
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Mar 20, 2026

@mdbooth: This pull request references OCPCLOUD-3319 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:

RelatedObject is an input to must-gather. must-gather already fetches most
namespaced objects when the namespace is specified, so we remove those.

We were also missing the VAPs and the new crd compatibility namespace.

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.

@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Mar 20, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: CHILL

Plan: Pro

Run ID: 43493f27-ff92-4453-bfbb-0960b0d1145b

📥 Commits

Reviewing files that changed from the base of the PR and between 691aa79 and 97bcf89.

📒 Files selected for processing (1)
  • manifests/0000_30_cluster-api_12_clusteroperator.yaml
🚧 Files skipped from review as they are similar to previous changes (1)
  • manifests/0000_30_cluster-api_12_clusteroperator.yaml

Walkthrough

Updated the ClusterOperator manifest's status.relatedObjects, replacing component-specific resource references with broader namespace-scoped entries and adding cluster-scoped admission-policy and CompatibilityRequirement API extension captures. (46 words)

Changes

Cohort / File(s) Summary
ClusterOperator manifest
manifests/0000_30_cluster-api_12_clusteroperator.yaml
Reworked status.relatedObjects: removed explicit component/resource entries (serviceaccounts, configmaps, deployments, specific clusteroperators) and replaced them with namespace-scoped entries for openshift-cluster-api, openshift-cluster-api-operator, openshift-compatibility-requirements-operator; added cluster-scoped captures for validatingadmissionpolicies, validatingadmissionpolicybindings, and apiextensions.openshift.io compatibilityrequirements.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 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.

@openshift-ci openshift-ci Bot requested review from chrischdi and nrb March 20, 2026 12:06
@mdbooth
Copy link
Copy Markdown
Contributor Author

mdbooth commented Mar 20, 2026

/pipeline required

@openshift-ci-robot
Copy link
Copy Markdown

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aws-capi-techpreview
/test e2e-aws-ovn
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-aws-ovn-techpreview
/test e2e-aws-ovn-techpreview-upgrade
/test e2e-azure-capi-techpreview
/test e2e-azure-ovn-techpreview
/test e2e-azure-ovn-techpreview-upgrade
/test e2e-gcp-capi-techpreview
/test e2e-gcp-ovn-techpreview
/test e2e-metal3-capi-techpreview
/test e2e-openstack-capi-techpreview
/test e2e-openstack-ovn-techpreview
/test e2e-vsphere-capi-techpreview
/test regression-clusterinfra-aws-ipi-techpreview-capi

- group: apiextensions.openshift.io
resource: compatibilityrequirements

# the installer controller dynamically adds entries for CAPI providers it installs No newline at end of file
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Nit, missing final new line char

@mdbooth
Copy link
Copy Markdown
Contributor Author

mdbooth commented Mar 21, 2026

/pipeline auto

@openshift-ci-robot
Copy link
Copy Markdown

Pipeline controller notification

The pipeline-auto label has been added to this PR. Second-stage tests will be triggered automatically when all first-stage tests pass.

@openshift-ci-robot
Copy link
Copy Markdown

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aws-capi-techpreview
/test e2e-aws-ovn
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-aws-ovn-techpreview
/test e2e-aws-ovn-techpreview-upgrade
/test e2e-azure-capi-techpreview
/test e2e-azure-ovn-techpreview
/test e2e-azure-ovn-techpreview-upgrade
/test e2e-gcp-capi-techpreview
/test e2e-gcp-ovn-techpreview
/test e2e-metal3-capi-techpreview
/test e2e-openstack-capi-techpreview
/test e2e-openstack-ovn-techpreview
/test e2e-vsphere-capi-techpreview
/test regression-clusterinfra-aws-ipi-techpreview-capi

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Mar 21, 2026

@mdbooth: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-azure-ovn-techpreview 97bcf89 link false /test e2e-azure-ovn-techpreview

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.

@mdbooth
Copy link
Copy Markdown
Contributor Author

mdbooth commented Mar 25, 2026

/test e2e-openstack-ovn-techpreview

@mdbooth
Copy link
Copy Markdown
Contributor Author

mdbooth commented Mar 25, 2026

Ignoring permafailing job

/override pull-ci-openshift-cluster-capi-operator-main-e2e-openstack-ovn-techpreview

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Mar 25, 2026

@mdbooth: Overrode contexts on behalf of mdbooth: ci/prow/e2e-openstack-ovn-techpreview

Details

In response to this:

Ignoring permafailing job

/override pull-ci-openshift-cluster-capi-operator-main-e2e-openstack-ovn-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.

@theobarberbany
Copy link
Copy Markdown
Contributor

/lgtm
/approve

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Mar 25, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Mar 25, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: theobarberbany

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 25, 2026
@mdbooth
Copy link
Copy Markdown
Contributor Author

mdbooth commented Mar 25, 2026

/verified by mbooth

Manual testing and careful code inspection.

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

@mdbooth: This PR has been marked as verified by mbooth.

Details

In response to this:

/verified by mbooth

Manual testing and careful code inspection.

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
Copy link
Copy Markdown

Tests from second stage were triggered manually. Pipeline can be controlled only manually, until HEAD changes. Use command to trigger second stage.

@openshift-merge-bot openshift-merge-bot Bot merged commit addefa6 into openshift:main Mar 25, 2026
24 of 25 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. pipeline-auto verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants