Skip to content

Commit

Permalink
OCPBUGS-29660: Ignore provisioning ip config if disabled
Browse files Browse the repository at this point in the history
getProvisioningIPCIDR now returns nil if ProvisioningNetwork is
disabled. The external HostIP will then be used (as intended
when the prov network is disabled).
  • Loading branch information
derekhiggins committed Jun 21, 2024
1 parent d9a11eb commit 95865cb
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions provisioning/baremetal_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ func getDHCPRange(config *metal3iov1alpha1.ProvisioningSpec) *string {
}

func getProvisioningIPCIDR(config *metal3iov1alpha1.ProvisioningSpec) *string {
if config.ProvisioningNetwork == metal3iov1alpha1.ProvisioningNetworkDisabled {
return nil
}
if config.ProvisioningNetworkCIDR != "" && config.ProvisioningIP != "" {
_, net, err := net.ParseCIDR(config.ProvisioningNetworkCIDR)
if err == nil {
Expand Down

0 comments on commit 95865cb

Please sign in to comment.