From d6299b725fb42f27da6178210537553442178c43 Mon Sep 17 00:00:00 2001 From: Derek Higgins Date: Thu, 20 Jun 2024 14:21:31 +0100 Subject: [PATCH] OCPBUGS-29660: Ignore provisioning ip config if disabled getProvisioningIPCIDR now returns nil if ProvisioningNetwork is disabled. The external HostIP will then be used (as intended when the prov network is disabled). --- provisioning/baremetal_config.go | 3 +++ provisioning/baremetal_pod_test.go | 3 +++ 2 files changed, 6 insertions(+) diff --git a/provisioning/baremetal_config.go b/provisioning/baremetal_config.go index d5366a164..3e70e23d0 100644 --- a/provisioning/baremetal_config.go +++ b/provisioning/baremetal_config.go @@ -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 { diff --git a/provisioning/baremetal_pod_test.go b/provisioning/baremetal_pod_test.go index 90e40dd47..6605428e8 100644 --- a/provisioning/baremetal_pod_test.go +++ b/provisioning/baremetal_pod_test.go @@ -380,18 +380,21 @@ func TestNewMetal3Containers(t *testing.T) { withEnv( containers["metal3-httpd"], envWithValue("PROVISIONING_INTERFACE", ""), + envWithFieldValue("PROVISIONING_IP", "status.hostIP"), envWithValue("IRONIC_LISTEN_PORT", "6388"), envWithValue("IRONIC_INSPECTOR_LISTEN_PORT", "5051"), ), withEnv( containers["metal3-ironic"], envWithValue("PROVISIONING_INTERFACE", ""), + envWithFieldValue("PROVISIONING_IP", "status.hostIP"), envWithValue("IRONIC_KERNEL_PARAMS", "rd.net.timeout.carrier=30 ip=dhcp6"), ), containers["metal3-ramdisk-logs"], withEnv( containers["metal3-ironic-inspector"], envWithValue("PROVISIONING_INTERFACE", ""), + envWithFieldValue("PROVISIONING_IP", "status.hostIP"), envWithValue("IRONIC_KERNEL_PARAMS", "rd.net.timeout.carrier=30 ip=dhcp6"), ), },