OCPBUGS-65847: vsphere: enable DHCP4/DHCP6 based on machine network I…

[rbbratta]

…P families

This commit fixes the vSphere CAPI machine generation to correctly set DHCP4 and DHCP6 flags based on the InstallConfig's machine network configuration. Previously, DHCP4 was always enabled and DHCP6 was only enabled when IPv6 was detected, which caused issues for IPv6-only clusters.

Changes:

• Replace hasIPv6MachineNetwork() with detectMachineNetworkIPFamilies() that returns both hasIPv4 and hasIPv6 by checking MachineNetwork and deprecated MachineCIDR fields
• Update GenerateMachines() to set DHCP4=hasIPv4 and DHCP6=hasIPv6 instead of hard-coding DHCP4=true
• Add comprehensive tests covering IPv4-only, IPv6-only, and dual-stack scenarios

This ensures:

• IPv4-only: DHCP4=true, DHCP6=false
• IPv6-only: DHCP4=false, DHCP6=true
• Dual-stack: DHCP4=true, DHCP6=true

This prevents WaitingForIPAllocation failures for control-plane VMs in all network configurations by ensuring the VSphereMachine network devices match the machineconfig expectations.

Generated-by: GPT-5.1

[openshift-ci-robot]

@rbbratta: This pull request references Jira Issue OCPBUGS-65847, which is invalid:

• expected the bug to target the "4.21.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:

…P families

This commit fixes the vSphere CAPI machine generation to correctly set DHCP4 and DHCP6 flags based on the InstallConfig's machine network configuration. Previously, DHCP4 was always enabled and DHCP6 was only enabled when IPv6 was detected, which caused issues for IPv6-only clusters.

Changes:

• Replace hasIPv6MachineNetwork() with detectMachineNetworkIPFamilies() that returns both hasIPv4 and hasIPv6 by checking MachineNetwork and deprecated MachineCIDR fields
• Update GenerateMachines() to set DHCP4=hasIPv4 and DHCP6=hasIPv6 instead of hard-coding DHCP4=true
• Add comprehensive tests covering IPv4-only, IPv6-only, and dual-stack scenarios

This ensures:

• IPv4-only: DHCP4=true, DHCP6=false
• IPv6-only: DHCP4=false, DHCP6=true
• Dual-stack: DHCP4=true, DHCP6=true

This prevents WaitingForIPAllocation failures for control-plane VMs in all network configurations by ensuring the VSphereMachine network devices match the machineconfig expectations.

Generated-by: GPT-5.1

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]

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

• pkg/asset/machines/vsphere/OWNERS

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

[rbbratta]

/hold

building for test on dualstack-primaryv6.

[openshift-ci]

@rbbratta: 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/golint	ca3b307	link	true	/test golint
ci/prow/okd-scos-e2e-vsphere-ovn	ca3b307	link	false	/test okd-scos-e2e-vsphere-ovn
ci/prow/e2e-aws-ovn	ca3b307	link	true	/test e2e-aws-ovn

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.