Skip to content

SPLAT-2584,OCPBUGS-69434: Added ability to install different IPAM version when in TP. #10169

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 2 commits into from
Dec 18, 2025
+12 −0
Merged

SPLAT-2584,OCPBUGS-69434: Added ability to install different IPAM version when in TP. #10169

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11abb80
Added ability to install different IPAM version when in TP.
vr4manta Dec 10, 2025
f136b97
Remove fmt println with logrus debug
jcpowermac Dec 17, 2025
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
12 changes: 12 additions & 0 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,6 +15,7 @@ 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 @@ -146,6 +147,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.EnabledFeatureGates().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"
}
}
data.IPClaims = append(data.IPClaims, claim...)
data.IPAddresses = append(data.IPAddresses, address...)
}
Expand Down