OCPBUGS-85063: Fix CredentialsRequest capability annotations by stefanonardo · Pull Request #630 · openshift/cluster-capi-operator

stefanonardo · 2026-07-21T12:56:45Z

Summary

Add CloudCredential to vSphere CredentialsRequest capability annotation so the CVO skips it when CloudCredential is disabled
Remove the baremetal CredentialsRequest — the secret it provisions is unused

🤖 Generated with Claude Code

Summary by CodeRabbit

Bug Fixes
- Updated the vSphere credentials capability classification to include cloud credentials and Cluster API.
- Removed the obsolete bare-metal Cluster API credentials request from the manifest.

Add CloudCredential to the vSphere capability annotation so the CVO skips it when CloudCredential is disabled. Remove the baremetal CredentialsRequest entirely as the secret it provisions is unused. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

openshift-merge-bot · 2026-07-21T12:56:47Z

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 · 2026-07-21T12:56:51Z

@stefanonardo: This pull request references Jira Issue OCPBUGS-85063, which is invalid:

expected the bug to target the "5.0.0" version, but no target version was set

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.

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

Details

In response to this:

Summary

Add CloudCredential to vSphere CredentialsRequest capability annotation so the CVO skips it when CloudCredential is disabled

Remove the baremetal CredentialsRequest — the secret it provisions is unused

🤖 Generated with Claude Code

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 · 2026-07-21T12:57:03Z

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 9889c3bd-da62-4aba-999c-8285a2180a9e

📥 Commits

Reviewing files that changed from the base of the PR and between dbddb63 and 2b77eb9.

📒 Files selected for processing (1)

manifests/0000_30_cluster-api_01_credentials-request.yaml

Walkthrough

The vSphere CredentialsRequest manifest now uses the CloudCredential+ClusterAPI capability annotation, and the baremetal CredentialsRequest resource was removed.

Changes

CredentialsRequest capability metadata

Layer / File(s)	Summary
Update capability annotation `manifests/0000_30_cluster-api_01_credentials-request.yaml`	The vSphere `CredentialsRequest` capability annotation changes from `ClusterAPI` to `CloudCredential+ClusterAPI`; the baremetal `CredentialsRequest` resource is removed.

Estimated code review effort: 1 (Trivial) | ~5 minutes

Possibly related PRs

openshift/cluster-capi-operator#588: Updates capability annotations for vSphere and baremetal CredentialsRequest resources in the same manifest.

Suggested reviewers: damdo

🚥 Pre-merge checks | ✅ 15

✅ Passed checks (15 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title accurately summarizes the main change to CredentialsRequest capability annotations.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names	✅ Passed	Only a manifest changed; no test files or Ginkgo titles were modified, so there are no unstable test names to flag.
Test Structure And Quality	✅ Passed	Only a manifest changed; no Ginkgo test code was added or modified, so the test-structure checklist is not applicable.
Microshift Test Compatibility	✅ Passed	Manifest-only change; no new Ginkgo e2e tests or test code were added.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	Only a manifest YAML changed; no new Ginkgo tests were added, so SNO compatibility is not applicable.
Topology-Aware Scheduling Compatibility	✅ Passed	Only a CredentialsRequest annotation changed and one unused CredentialsRequest was removed; no pod specs, affinities, node selectors, or replica settings were added.
Ote Binary Stdout Contract	✅ Passed	Only a YAML manifest changed; no main/init/TestMain/suite setup code or stdout writes were touched.
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	Only a manifest changed; no Ginkgo tests were added or modified, so the IPv6/disconnected-network check is not applicable.
No-Weak-Crypto	✅ Passed	Changed file is a YAML manifest; no weak-crypto terms, custom crypto, or secret/token comparisons are present.
Container-Privileges	✅ Passed	Changed manifests contain no privileged, hostPID/Network/IPC, SYS_ADMIN, or allowPrivilegeEscalation settings.
No-Sensitive-Data-In-Logs	✅ Passed	Only a manifest changed: the vSphere annotation was updated and the baremetal CredentialsRequest was removed; no logging or sensitive data exposure found.

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

Warning

There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure.

🔧 Checkov (3.3.8)

manifests/0000_30_cluster-api_01_credentials-request.yaml

Traceback (most recent call last):
File "/usr/local/bin/checkov", line 2, in
from checkov.main import Checkov
ModuleNotFoundError: No module named 'checkov'

_{Comment @coderabbitai help to get the list of available commands.}

stefanonardo · 2026-07-21T12:57:13Z

/cherry-pick release-4.22

openshift-cherrypick-robot · 2026-07-21T12:57:15Z

@stefanonardo: once the present PR merges, I will cherry-pick it on top of release-4.22 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-4.22

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 · 2026-07-22T10:51:28Z

---
-apiVersion: cloudcredential.openshift.io/v1
-kind: CredentialsRequest
-metadata:
-  name: openshift-cluster-api-baremetal
-  namespace: openshift-cloud-credential-operator
-  annotations:
-    capability.openshift.io/name: ClusterAPI
-    exclude.release.openshift.io/internal-openshift-hosted: "true"
-    include.release.openshift.io/self-managed-high-availability: "true"
-    release.openshift.io/feature-gate: "ClusterAPIMachineManagement"
-spec:
-  providerSpec:
-    apiVersion: cloudcredential.openshift.io/v1
-    kind: Metal3ProviderSpec
-  secretRef:
-    name: capm3-manager-bootstrap-credentials
-    namespace: openshift-cluster-api


What's the context behind removing this?

I couldn't find any usage of it but we can keep it if we want to be on the safe side.

I'd think it is needed by https://github.com/openshift/cluster-api-provider-metal3 :)

Upon lookup I can't find it:

[~/src/cluster-api-provider-metal3 git:(main)] $ rg "capm3-manager-bootstrap-credentials" [~/src/cluster-api-provider-metal3 git:(main)] $ rg "bootstrap-credentials" [~/src/cluster-api-provider-metal3 git:(main)] $

@honza @dtantsur is this needed for capm3?

It's quite possible this is a leftover from upstream. AFAIK we don't need this but surely CI will tell us with more certainty...

Let's see, kicked off tests.

The metal3 e2e is passing so I guess it is not needed for now. Good

damdo · 2026-07-22T10:51:34Z

  namespace: openshift-cloud-credential-operator
  annotations:
-    capability.openshift.io/name: ClusterAPI
+    capability.openshift.io/name: CloudCredential+ClusterAPI


good catch!

damdo · 2026-07-22T12:00:05Z

/pipeline required

openshift-merge-bot · 2026-07-22T12:00:08Z

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aws-ovn
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-aws-capi-disconnected-techpreview
/test e2e-aws-capi-techpreview
/test e2e-aws-capi-techpreview-post-install
/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-vsphere-capi-techpreview
/test regression-clusterinfra-aws-ipi-techpreview-capi

stefanonardo · 2026-07-23T07:47:25Z

lot of infra issues

/retest

stefanonardo · 2026-07-23T12:19:12Z

/retest

damdo

/approve
/lgtm

openshift-merge-bot · 2026-07-24T14:22:55Z

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aws-ovn
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-aws-capi-disconnected-techpreview
/test e2e-aws-capi-techpreview
/test e2e-aws-capi-techpreview-post-install
/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-vsphere-capi-techpreview
/test regression-clusterinfra-aws-ipi-techpreview-capi

openshift-ci · 2026-07-24T14:24:15Z

[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:

~~OWNERS~~ [damdo]

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

damdo · 2026-07-24T14:30:04Z

/jira refresh

openshift-ci-robot · 2026-07-24T14:30:08Z

@damdo: This pull request references Jira Issue OCPBUGS-85063, which is invalid:

expected the bug to target the "5.0.0" version, but no target version was set

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

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.

stefanonardo · 2026-07-24T14:38:29Z

/jira refresh

openshift-ci-robot · 2026-07-24T14:38:36Z

@stefanonardo: This pull request references Jira Issue OCPBUGS-85063, 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 (5.0.0) matches configured target version for branch (5.0.0)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

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.

stefanonardo · 2026-07-24T14:38:36Z

/cherry-pick release-4.22

openshift-cherrypick-robot · 2026-07-24T14:38:39Z

@stefanonardo: once the present PR merges, I will cherry-pick it on top of release-4.22 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-4.22

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.

simkam · 2026-07-31T10:20:34Z

/retest-required

damdo · 2026-07-31T15:11:44Z

/test e2e-metal3-capi-techpreview

damdo · 2026-07-31T15:12:25Z

/test e2e-azure-ovn-techpreview e2e-gcp-ovn-techpreview

openshift-ci · 2026-07-31T19:16:58Z

@stefanonardo: The following tests 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/regression-clusterinfra-aws-ipi-techpreview-capi	`2b77eb9`	link	false	`/test regression-clusterinfra-aws-ipi-techpreview-capi`
ci/prow/e2e-aws-capi-disconnected-techpreview	`2b77eb9`	link	false	`/test e2e-aws-capi-disconnected-techpreview`
ci/prow/e2e-aws-capi-techpreview	`2b77eb9`	link	true	`/test e2e-aws-capi-techpreview`
ci/prow/e2e-metal3-capi-techpreview	`2b77eb9`	link	false	`/test e2e-metal3-capi-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.

openshift-ci Bot requested review from RadekManak and theobarberbany July 21, 2026 12:57

damdo reviewed Jul 22, 2026

View reviewed changes

damdo reviewed Jul 24, 2026

View reviewed changes

openshift-ci Bot assigned damdo Jul 24, 2026

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 24, 2026

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 24, 2026

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 Jul 24, 2026

Uh oh!

Conversation

stefanonardo commented Jul 21, 2026 • edited by coderabbitai Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Summary by CodeRabbit

Uh oh!

openshift-merge-bot Bot commented Jul 21, 2026

Uh oh!

openshift-ci-robot commented Jul 21, 2026

Summary

Uh oh!

coderabbitai Bot commented Jul 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Uh oh!

stefanonardo commented Jul 21, 2026

Uh oh!

openshift-cherrypick-robot commented Jul 21, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

damdo commented Jul 22, 2026

Uh oh!

openshift-merge-bot Bot commented Jul 22, 2026

Uh oh!

stefanonardo commented Jul 23, 2026

Uh oh!

stefanonardo commented Jul 23, 2026

Uh oh!

damdo left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-merge-bot Bot commented Jul 24, 2026

Uh oh!

openshift-ci Bot commented Jul 24, 2026

Uh oh!

damdo commented Jul 24, 2026

Uh oh!

openshift-ci-robot commented Jul 24, 2026

Uh oh!

stefanonardo commented Jul 24, 2026

Uh oh!

openshift-ci-robot commented Jul 24, 2026

Uh oh!

stefanonardo commented Jul 24, 2026

Uh oh!

openshift-cherrypick-robot commented Jul 24, 2026

Uh oh!

simkam commented Jul 31, 2026

Uh oh!

damdo commented Jul 31, 2026

Uh oh!

damdo commented Jul 31, 2026

Uh oh!

openshift-ci Bot commented Jul 31, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

stefanonardo commented Jul 21, 2026 •

edited by coderabbitai Bot

Loading

coderabbitai Bot commented Jul 21, 2026 •

edited

Loading