Skip to content

OCPBUGS-61949: Remove references to cluster-api-operator image#384

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
openshift-cloud-team:remove-cluster-api-operator
Jan 15, 2026
Merged

OCPBUGS-61949: Remove references to cluster-api-operator image#384
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
openshift-cloud-team:remove-cluster-api-operator

Conversation

@mdbooth
Copy link
Copy Markdown
Contributor

@mdbooth mdbooth commented Oct 13, 2025

Summary by CodeRabbit

  • Chores
    • Removed the cluster-kube-cluster-api-operator image from development image mappings, configuration, and image stream tags.
    • Streamlines the image inventory by eliminating an unused reference; remaining images are unchanged.
    • No impact on existing functionality or cluster behavior; this is a cleanup of obsolete image entries.
    • Reduces maintenance overhead and potential confusion in image lists without altering workflows or deployment processes.

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Oct 13, 2025
@openshift-ci-robot
Copy link
Copy Markdown

@mdbooth: This pull request references Jira Issue OCPBUGS-61949, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.21.0) matches configured target version for branch (4.21.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

The bug has been updated to refer to the pull request using the external bug tracker.

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.

@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Oct 13, 2025

Walkthrough

Removed the cluster-kube-cluster-api-operator image entry across three locations: dev-images.json, the cluster-capi-operator-images ConfigMap data (images.json), and the image stream tags in manifests/image-references. No other keys, structures, or tags were altered.

Changes

Cohort / File(s) Summary
Image reference removal
dev-images.json, manifests/0000_30_cluster-api_01_images.configmap.yaml, manifests/image-references
Deleted the cluster-kube-cluster-api-operator image entry from local dev mappings, the ConfigMap images.json, and the imagestream tags; all other entries unchanged.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

Poem

I hop through tags and prune the vine,
One image gone—clean, neat, fine.
Fewer carrots in the crate today,
But every sprout still points the way.
Thump, thump—repos light and clear,
A tidy burrow for release is near. 🥕✨

Pre-merge checks and finishing touches

✅ Passed checks (3 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title Check ✅ Passed The title accurately reflects the core change of removing all references to the cluster-api-operator image and includes the relevant bug tracking number in a concise form, making it clear to reviewers what the pull request accomplishes.
Docstring Coverage ✅ Passed No functions found in the changes. Docstring coverage check skipped.
✨ Finishing touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment

📜 Recent review details

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Cache: Disabled due to data retention organization setting

Knowledge base: Disabled due to data retention organization setting

📥 Commits

Reviewing files that changed from the base of the PR and between eea205c and 2597826.

📒 Files selected for processing (3)
  • dev-images.json (0 hunks)
  • manifests/0000_30_cluster-api_01_images.configmap.yaml (0 hunks)
  • manifests/image-references (0 hunks)
💤 Files with no reviewable changes (3)
  • dev-images.json
  • manifests/0000_30_cluster-api_01_images.configmap.yaml
  • manifests/image-references

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

Copy link
Copy Markdown
Contributor

@chrischdi chrischdi left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Oct 13, 2025
@damdo
Copy link
Copy Markdown
Member

damdo commented Oct 13, 2025

/test ?

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Oct 13, 2025

@damdo: The following commands are available to trigger required jobs:

/test build
/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-upgrade
/test e2e-gcp-capi-techpreview
/test e2e-gcp-ovn-techpreview
/test e2e-openstack-capi-techpreview
/test e2e-openstack-ovn-techpreview
/test e2e-vsphere-capi-techpreview
/test images
/test lint
/test okd-scos-images
/test unit
/test vendor
/test verify-deps

The following commands are available to trigger optional jobs:

/test e2e-azure-ovn-techpreview
/test e2e-metal3-capi-techpreview
/test okd-scos-e2e-aws-ovn
/test regression-clusterinfra-aws-ipi-techpreview-capi

Use /test all to run the following jobs that were automatically triggered:

pull-ci-openshift-cluster-capi-operator-main-build
pull-ci-openshift-cluster-capi-operator-main-images
pull-ci-openshift-cluster-capi-operator-main-lint
pull-ci-openshift-cluster-capi-operator-main-okd-scos-e2e-aws-ovn
pull-ci-openshift-cluster-capi-operator-main-okd-scos-images
pull-ci-openshift-cluster-capi-operator-main-unit
pull-ci-openshift-cluster-capi-operator-main-vendor
pull-ci-openshift-cluster-capi-operator-main-verify-deps
Details

In response to this:

/test ?

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.

@damdo
Copy link
Copy Markdown
Member

damdo commented Oct 13, 2025

/test regression-clusterinfra-aws-ipi-techpreview-capi
/test e2e-aws-ovn-techpreview-upgrade
/test e2e-aws-capi-techpreview
/test e2e-aws-ovn
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2

Copy link
Copy Markdown
Member

@damdo damdo left a comment

Choose a reason for hiding this comment

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

/approve
/hold

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 13, 2025
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Oct 13, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: damdo

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 Oct 13, 2025
@damdo
Copy link
Copy Markdown
Member

damdo commented Oct 13, 2025

/verified bypass

No need for formal QE verification on this

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Oct 13, 2025
@openshift-ci-robot
Copy link
Copy Markdown

@damdo: The verified label has been added.

Details

In response to this:

/verified bypass

No need to formal QE verification on 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.

@damdo
Copy link
Copy Markdown
Member

damdo commented Oct 13, 2025

/unhold

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 13, 2025
@damdo
Copy link
Copy Markdown
Member

damdo commented Oct 13, 2025

/hold

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 13, 2025
@openshift-bot
Copy link
Copy Markdown

/jira refresh

The requirements for Jira bugs have changed (Jira issues linked to PRs on main branch need to target different OCP), recalculating validity.

@openshift-ci-robot openshift-ci-robot added jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. and removed jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Dec 12, 2025
@openshift-ci-robot
Copy link
Copy Markdown

@openshift-bot: This pull request references Jira Issue OCPBUGS-61949, which is invalid:

  • expected the bug to target either version "4.22." or "openshift-4.22.", but it targets "4.21.0" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

The requirements for Jira bugs have changed (Jira issues linked to PRs on main branch need to target different OCP), recalculating validity.

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.

@mdbooth
Copy link
Copy Markdown
Contributor Author

mdbooth commented Jan 15, 2026

Replaced by #444

@mdbooth mdbooth closed this Jan 15, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@mdbooth: This pull request references Jira Issue OCPBUGS-61949. The bug has been updated to no longer refer to the pull request using the external bug tracker.

Details

In response to this:

Summary by CodeRabbit

  • Chores
  • Removed the cluster-kube-cluster-api-operator image from development image mappings, configuration, and image stream tags.
  • Streamlines the image inventory by eliminating an unused reference; remaining images are unchanged.
  • No impact on existing functionality or cluster behavior; this is a cleanup of obsolete image entries.
  • Reduces maintenance overhead and potential confusion in image lists without altering workflows or deployment processes.

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.

@mdbooth
Copy link
Copy Markdown
Contributor Author

mdbooth commented Jan 15, 2026

/jira-refresh

@mdbooth mdbooth reopened this Jan 15, 2026
@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 15, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@mdbooth: This pull request references Jira Issue OCPBUGS-61949, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.22.0) matches configured target version for branch (4.22.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Summary by CodeRabbit

  • Chores
  • Removed the cluster-kube-cluster-api-operator image from development image mappings, configuration, and image stream tags.
  • Streamlines the image inventory by eliminating an unused reference; remaining images are unchanged.
  • No impact on existing functionality or cluster behavior; this is a cleanup of obsolete image entries.
  • Reduces maintenance overhead and potential confusion in image lists without altering workflows or deployment processes.

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.

@mdbooth
Copy link
Copy Markdown
Contributor Author

mdbooth commented Jan 15, 2026

/jira refresh

@openshift-ci-robot
Copy link
Copy Markdown

@mdbooth: This pull request references Jira Issue OCPBUGS-61949, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.22.0) matches configured target version for branch (4.22.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

Details

In response to this:

/jira refresh

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.

@mdbooth
Copy link
Copy Markdown
Contributor Author

mdbooth commented Jan 15, 2026

/hold cancel

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 15, 2026
@mdbooth
Copy link
Copy Markdown
Contributor Author

mdbooth commented Jan 15, 2026

/verified bypass

@openshift-ci-robot
Copy link
Copy Markdown

@mdbooth:

Details

In response to this:

/verified bypass

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 Jan 15, 2026

@mdbooth: 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 6d81723 into openshift:main Jan 15, 2026
16 checks passed
@openshift-ci-robot
Copy link
Copy Markdown

@mdbooth: Jira Issue OCPBUGS-61949: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-61949 has been moved to the MODIFIED state.

Details

In response to this:

Summary by CodeRabbit

  • Chores
  • Removed the cluster-kube-cluster-api-operator image from development image mappings, configuration, and image stream tags.
  • Streamlines the image inventory by eliminating an unused reference; remaining images are unchanged.
  • No impact on existing functionality or cluster behavior; this is a cleanup of obsolete image entries.
  • Reduces maintenance overhead and potential confusion in image lists without altering workflows or deployment processes.

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.

@mdbooth mdbooth deleted the remove-cluster-api-operator branch January 16, 2026 13:08
@mdbooth
Copy link
Copy Markdown
Contributor Author

mdbooth commented Jan 16, 2026

/cherrypick release-4.22 release-4.21

@openshift-cherrypick-robot
Copy link
Copy Markdown

@mdbooth: new pull request could not be created: failed to create pull request against openshift/cluster-capi-operator#release-4.22 from head openshift-cherrypick-robot:cherry-pick-384-to-release-4.22: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"No commits between openshift:release-4.22 and openshift-cherrypick-robot:cherry-pick-384-to-release-4.22"}],"documentation_url":"https://docs.github.com/rest/pulls/pulls#create-a-pull-request","status":"422"}

Details

In response to this:

/cherrypick release-4.22 release-4.21

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.

@mdbooth
Copy link
Copy Markdown
Contributor Author

mdbooth commented Jan 16, 2026

/cherrypick release-4.21

@openshift-cherrypick-robot
Copy link
Copy Markdown

@mdbooth: new pull request created: #445

Details

In response to this:

/cherrypick release-4.21

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.

@openshift-merge-robot
Copy link
Copy Markdown
Contributor

Fix included in accepted release 4.22.0-0.nightly-2026-01-19-085729

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-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants