openshift/installer
1
0
Fork 0
mirror of https://github.com/openshift/installer.git synced 2026-02-05 15:47:14 +01:00
Code Issues Releases Activity

Added ability to install different IPAM version when in TP.

Browse Source
This commit is contained in:
vr4manta
2025-12-10 14:00:44 -05:00
committed by openshift-cherrypick-robot
parent 763d379a9d
commit 2a9865f47a
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/asset/machines/vsphere/machines.go
View File

@@ -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"
@@ -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) {
fmt.Println("Processing api update")
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...)
}