[release-4.22] OCPBUGS-100144: UPSTREAM: 3265: :bug: allow unconditional providerID updates in OpenStackMachine by openshift-cherrypick-robot · Pull Request #426 · openshift/cluster-api-provider-openstack

openshift-cherrypick-robot · 2026-07-29T10:51:16Z

This is an automated cherry-pick of #425

/assign simkam

…chine Remove conditional immutability check that only allowed providerID and instanceID to be set when the old value was nil. This created a race condition where controller reconciliation retries would be rejected by the webhook, causing IPI installation failures. The fix aligns CAPO with upstream CAPI patterns used by AWS, GCP, and VSphere providers, which all allow providerID to be updated unconditionally. This prevents webhook rejections during normal controller operation while maintaining the same practical behavior since the controller only sets these fields once. | Provider | File | Restriction | |----------|------|-------------| | **AWS (CAPA)** | [awsmachine_webhook.go](https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/af0e5ca481bd15349b3d6e3336238152467086a4/webhooks/awsmachine_webhook.go#L128) | Unconditional | | **GCP (CAPG)** | [gcpmachine_webhook.go](https://github.com/kubernetes-sigs/cluster-api-provider-gcp/blob/930755247ae023047b1d4b62b656c3112ecdaecc/webhooks/gcpmachine_webhook.go#L88) | Unconditional | | **VSphere (CAPV)** | [vspheremachine.go](https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/blob/dadbe25b1117ace60df90d3dd9e4c943d39ac4a0/internal/webhooks/vspheremachine.go#L109) | Allowlist | | **Azure (CAPZ)** | [azuremachine_webhook.go](https://github.com/kubernetes-sigs/cluster-api-provider-azure/blob/cd72698e45a63a84a8dbf2f385837e42a5735278/internal/webhooks/azuremachine_webhook.go#L75) | No restriction |

openshift-ci · 2026-07-29T10:51:23Z

@openshift-cherrypick-robot: GitHub didn't allow me to assign the following users: simkam.

Note that only openshift members with read permissions, repo collaborators and people who have commented on this issue/PR can be assigned. Additionally, issues/PRs can only have 10 assignees at the same time.
For more information please see the contributor guide

Details

In response to this:

This is an automated cherry-pick of #425

/assign simkam

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.

coderabbitai · 2026-07-29T10:51:27Z

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: ba3b92d6-f310-49f2-a2c0-fc6687c90d74

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

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

openshift-ci · 2026-07-29T10:51:53Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign joelspeed for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

DOWNSTREAM_OWNERS

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

openshift-ci-robot · 2026-07-29T10:52:28Z

@openshift-cherrypick-robot: Jira Issue OCPBUGS-94057 has been cloned as Jira Issue OCPBUGS-100144. Will retitle bug to link to clone.
/retitle [release-4.22] OCPBUGS-100144: UPSTREAM: 3265: 🐛 allow unconditional providerID updates in OpenStackMachine

Details

In response to this:

This is an automated cherry-pick of #425

/assign simkam

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 · 2026-07-29T10:52:40Z

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-100144, which is invalid:

release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
expected dependent Jira Issue OCPBUGS-94057 to target a version in 5.0.0, but it targets "5.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.

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

Details

In response to this:

This is an automated cherry-pick of #425

/assign simkam

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.

simkam · 2026-07-29T11:12:03Z

/jira refresh

openshift-ci-robot · 2026-07-29T11:12:11Z

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

7 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 New, which is one of the valid states (NEW, ASSIGNED, POST)
release note type set to "Release Note Not Required"
dependent bug Jira Issue OCPBUGS-94057 is in the state MODIFIED, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
dependent Jira Issue OCPBUGS-94057 targets the "5.0.0" version, which is one of the valid target versions: 5.0.0
bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (tjadhav@redhat.com), skipping review request.

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.

openshift-ci · 2026-07-29T13:26:53Z

@openshift-cherrypick-robot: 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.

simkam added 2 commits July 29, 2026 10:51

UPSTREAM: <drop>: vendor

ffa4bf0

openshift-cherrypick-robot mentioned this pull request Jul 29, 2026

OCPBUGS-94057: UPSTREAM: 3265: 🐛 allow unconditional providerID updates in OpenStackMachine #425

Merged

openshift-ci Bot requested review from gryf and stephenfin July 29, 2026 10:51

openshift-ci Bot changed the title ~~[release-4.22] OCPBUGS-94057: UPSTREAM: 3265: 🐛 allow unconditional providerID updates in OpenStackMachine~~ [release-4.22] OCPBUGS-100144: UPSTREAM: 3265: 🐛 allow unconditional providerID updates in OpenStackMachine Jul 29, 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 29, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[release-4.22] OCPBUGS-100144: UPSTREAM: 3265: 🐛 allow unconditional providerID updates in OpenStackMachine - #426

[release-4.22] OCPBUGS-100144: UPSTREAM: 3265: 🐛 allow unconditional providerID updates in OpenStackMachine#426
openshift-cherrypick-robot wants to merge 2 commits into
openshift:release-4.22from
openshift-cherrypick-robot:cherry-pick-425-to-release-4.22

openshift-cherrypick-robot commented Jul 29, 2026

Uh oh!

openshift-ci Bot commented Jul 29, 2026

Uh oh!

coderabbitai Bot commented Jul 29, 2026

Review skipped

Uh oh!

openshift-ci Bot commented Jul 29, 2026

Uh oh!

openshift-ci-robot commented Jul 29, 2026

Uh oh!

openshift-ci-robot commented Jul 29, 2026

Uh oh!

simkam commented Jul 29, 2026

Uh oh!

openshift-ci-robot commented Jul 29, 2026

Uh oh!

openshift-ci Bot commented Jul 29, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

openshift-cherrypick-robot commented Jul 29, 2026

Uh oh!

openshift-ci Bot commented Jul 29, 2026

Uh oh!

coderabbitai Bot commented Jul 29, 2026

Review skipped

Uh oh!

openshift-ci Bot commented Jul 29, 2026

Uh oh!

openshift-ci-robot commented Jul 29, 2026

Uh oh!

openshift-ci-robot commented Jul 29, 2026

Uh oh!

simkam commented Jul 29, 2026

Uh oh!

openshift-ci-robot commented Jul 29, 2026

Uh oh!

openshift-ci Bot commented Jul 29, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants