Skip to content

[release-4.20] OCPBUGS-105436: Use providerSpec.Template in vSphere machineset reconciliation - #6386

Merged
openshift-merge-bot[bot] merged 2 commits into
openshift:release-4.20from
djoshy:4.20-vsphere-fix
Aug 11, 2026
Merged

[release-4.20] OCPBUGS-105436: Use providerSpec.Template in vSphere machineset reconciliation#6386
openshift-merge-bot[bot] merged 2 commits into
openshift:release-4.20from
djoshy:4.20-vsphere-fix

Conversation

@djoshy

@djoshy djoshy commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

Yet another manual cherry-pick of #6381. This time, due to some manifests being unique to 4.20.

djoshy added 2 commits August 7, 2026 12:52
When a new failure domain is added, the controller always looked up the template by the computed name, ignoring providerSpec.Template, causing reconciliation to fail. Fix by checking providerSpec.Template first, using errors.As for NotFoundError, and creating the template from OVA when none exists.
Also avoid destroying customer-managed VMs: govmomi's finder matches by name across the whole inventory with no folder scoping, so a name match outside providerSpec.Workspace.Folder is now left untouched instead of being treated
as MCO's template and swapped out.
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@coderabbitai

coderabbitai Bot commented Aug 7, 2026

Copy link
Copy Markdown

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: e4dff73d-6ce4-49d8-a44c-19441327dfc0

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.

@djoshy

djoshy commented Aug 7, 2026

Copy link
Copy Markdown
Contributor Author

/jira cherry-pick OCPBUGS-105303

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

Copy link
Copy Markdown
Contributor

@djoshy: Jira Issue OCPBUGS-105303 has been cloned as Jira Issue OCPBUGS-105436. Will retitle bug to link to clone.
/retitle OCPBUGS-105436: Use providerSpec.Template in vSphere machineset reconciliation

Details

In response to this:

/jira cherry-pick OCPBUGS-105303

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 openshift-ci Bot changed the title Use providerSpec.Template in vSphere machineset reconciliation OCPBUGS-105436: Use providerSpec.Template in vSphere machineset reconciliation Aug 7, 2026
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Aug 7, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@djoshy: This pull request references Jira Issue OCPBUGS-105436, which is invalid:

  • expected dependent Jira Issue OCPBUGS-105303 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is MODIFIED 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:

Yet another manual cherry-pick of #6381. This time, due to some manifests being unique to 4.20.

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.

@djoshy djoshy changed the title OCPBUGS-105436: Use providerSpec.Template in vSphere machineset reconciliation [release-4.20] OCPBUGS-105436: Use providerSpec.Template in vSphere machineset reconciliation Aug 7, 2026

@isabella-janssen isabella-janssen left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

/lgtm
/label backport-risk-assessed

@openshift-ci openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Aug 7, 2026
@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 7, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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-upgrade
/test e2e-gcp-op-ocl-part1
/test e2e-gcp-op-ocl-part2
/test e2e-gcp-op-part1
/test e2e-gcp-op-part2
/test e2e-gcp-op-single-node
/test e2e-hypershift

@openshift-ci

openshift-ci Bot commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: djoshy, isabella-janssen

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 [djoshy,isabella-janssen]

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

@djoshy

djoshy commented Aug 11, 2026

Copy link
Copy Markdown
Contributor Author

/jira refresh

/retest-required

/verified later @ptalgulk01

@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 Aug 11, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@djoshy: This pull request references Jira Issue OCPBUGS-105436, 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.20.z) matches configured target version for branch (4.20.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-105303 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-105303 targets the "4.21.z" version, which is one of the valid target versions: 4.21.0, 4.21.z
  • bug has dependents

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

Details

In response to this:

/jira refresh

/retest-required

/verified later @ptalgulk01

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 verified-later verified Signifies that the PR passed pre-merge verification criteria labels Aug 11, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@djoshy: This PR has been marked to be verified later by @ptalgulk01.

Details

In response to this:

/jira refresh

/retest-required

/verified later @ptalgulk01

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.

@djoshy

djoshy commented Aug 11, 2026

Copy link
Copy Markdown
Contributor Author

The e2e seems to be failing due to infra issues and this PR should have no effect on GCP clusters. Overriding:

/override ci/prow/e2e-gcp-op-part2

@openshift-ci

openshift-ci Bot commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

@djoshy: Overrode contexts on behalf of djoshy: ci/prow/e2e-gcp-op-part2

Details

In response to this:

The e2e seems to be failing due to infra issues and this PR should have no effect on GCP clusters. Overriding:

/override ci/prow/e2e-gcp-op-part2

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-ci

openshift-ci Bot commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

@djoshy: 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-gcp-op-part2 c7a1259 link true /test e2e-gcp-op-part2

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 acca836 into openshift:release-4.20 Aug 11, 2026
17 checks passed
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@djoshy: Jira Issue OCPBUGS-105436: All pull requests linked via external trackers have merged:

This pull request has the verified-later tag and will need to be manually moved to VERIFIED after testing. Jira Issue OCPBUGS-105436 has been moved to the MODIFIED state.

Details

In response to this:

Yet another manual cherry-pick of #6381. This time, due to some manifests being unique to 4.20.

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.

@djoshy
djoshy deleted the 4.20-vsphere-fix branch August 11, 2026 14:46
@openshift-merge-robot

Copy link
Copy Markdown
Contributor

Fix included in release 4.20.0-0.nightly-2026-08-11-211935

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. 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 verified-later

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants