Skip to content

OCPBUGS-81309: Fix vSphere with static IPs on TPNU #10442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Apr 2, 2026
+11 −12
Merged

OCPBUGS-81309: Fix vSphere with static IPs on TPNU #10442

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions pkg/asset/machines/vsphere/machines.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
ipamv1 "sigs.k8s.io/cluster-api/api/ipam/v1beta1" //nolint:staticcheck //CORS-3563

v1 "github.com/openshift/api/config/v1"
"github.com/openshift/api/features"
machinev1 "github.com/openshift/api/machine/v1"
machineapi "github.com/openshift/api/machine/v1beta1"
"github.com/openshift/installer/pkg/types"
Expand Down Expand Up @@ -147,17 +146,17 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
if err != nil {
return data, err
} else if claim != nil && address != nil {
// To prevent having to touch many function below, adding logic here to ClusterCAPI issue with v1beta1 vs v1beta2.
// If cluster capi operator is enabled, we need to support v1beta2 of the IPAM. If disabled, we can keep v1beta1.
if config.Enabled(features.FeatureGateClusterAPIMachineManagement) {
logrus.Debug("updating capi ipam apiVersion from v1beta1 to v1beta2 when feature gate ClusterAPIMachineManagement is enabled")
for index := range claim {
claim[index].APIVersion = "ipam.cluster.x-k8s.io/v1beta2"
}
for index := range address {
address[index].APIVersion = "ipam.cluster.x-k8s.io/v1beta2"
}
}
// IPClaims and IPAddresses are both CAPI APIs whose CRD is
// installed by the CAPI operator based on manifests in the
// cluster-api component.
//
// To avoid requiring a call to a conversion webhook whose endpoint
// may not be up yet, we must ensure the IPAM API version specified
// here matches the storage version of the IPAM API installed by the
// cluster-api component. As of 4.22 this is v1beta1 for both
// Default and TPNU clusters, even though TPNU clusters use v1beta2.
// Expect to update this here when the cluster-api component storage
// version is updated to v1beta2.
data.IPClaims = append(data.IPClaims, claim...)
data.IPAddresses = append(data.IPAddresses, address...)
}
Expand Down