Skip to content

OCPBUGS-69399: Allow ProvisioningCIDR for unmanaged network #553

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
Mar 17, 2026
Merged

OCPBUGS-69399: Allow ProvisioningCIDR for unmanaged network #553

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion api/v1alpha1/provisioning_validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ func validateProvisioningNetworkSettings(ip string, cidr string, dhcpRange strin
return errs
}

if provisioningNetworkMode != ProvisioningNetworkManaged {
if provisioningNetworkMode == ProvisioningNetworkDisabled {
return errs
}
// Verify Network CIDR
Expand Down
8 changes: 8 additions & 0 deletions api/v1alpha1/provisioning_validation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,14 @@ func TestValidateUnmanagedProvisioningConfig(t *testing.T) {
expectedMode: ProvisioningNetworkUnmanaged,
expectedMsg: "provisioningIP",
},
{
// ProvisioningIP is not in the NetworkCIDR
name: "InvalidUnmanagedProvisioningIPCIDR",
spec: unmanagedProvisioning().ProvisioningIP("172.30.30.3").build(),
expectedError: true,
expectedMode: ProvisioningNetworkUnmanaged,
expectedMsg: "is not in the range defined by the provisioningNetworkCIDR",
},
{
// Missing provisioning IP.
name: "MissingProvisioningIP",
Expand Down
4 changes: 3 additions & 1 deletion provisioning/baremetal_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,9 @@ func getProvisioningIPWithPrefix(config *metal3iov1alpha1.ProvisioningSpec) *str
}

func getProvisioningIP(config *metal3iov1alpha1.ProvisioningSpec) *string {
if config.ProvisioningNetwork == metal3iov1alpha1.ProvisioningNetworkManaged {
// Use provisioningCIDR for unmanaged provisioning network as well so that corresponding networking configuration
// happens at the time of deployment.
if config.ProvisioningNetwork != metal3iov1alpha1.ProvisioningNetworkDisabled {
return getProvisioningIPWithPrefix(config)
}

Expand Down
6 changes: 6 additions & 0 deletions provisioning/baremetal_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ func TestGetMetal3DeploymentConfig(t *testing.T) {
spec: managedProvisioning().build(),
expectedValue: ptr.To("eth0"),
},
{
name: "Unmanaged ProvisioningIPCIDR",
configName: provisioningIP,
spec: unmanagedProvisioning().build(),
expectedValue: ptr.To("172.30.20.3/24"),
},
{
name: "Unmanaged DeployKernelUrl",
configName: deployKernelUrl,
Expand Down
15 changes: 12 additions & 3 deletions provisioning/baremetal_pod_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,15 @@ func TestBuildEnvVar(t *testing.T) {
Value: "172.30.20.3/24",
},
},
{
name: "Unanaged ProvisioningIPCIDR",
configName: provisioningIP,
spec: unmanagedProvisioning().build(),
expectedEnvVar: corev1.EnvVar{
Name: provisioningIP,
Value: "172.30.20.3/24",
},
},
{
name: "Unmanaged ProvisioningInterface",
configName: provisioningInterface,
Expand Down Expand Up @@ -390,10 +399,10 @@ func TestNewMetal3Containers(t *testing.T) {
name: "UnmanagedSpec",
config: unmanagedProvisioning().build(),
expectedContainers: []corev1.Container{
withEnv(containers["metal3-httpd"], envWithValue("PROVISIONING_INTERFACE", "ensp0"), envWithValue("PROVISIONING_IP", "172.30.20.3")),
withEnv(containers["metal3-ironic"], envWithValue("PROVISIONING_INTERFACE", "ensp0"), envWithValue("PROVISIONING_IP", "172.30.20.3")),
withEnv(containers["metal3-httpd"], envWithValue("PROVISIONING_INTERFACE", "ensp0"), envWithValue("PROVISIONING_IP", "172.30.20.3/24")),
withEnv(containers["metal3-ironic"], envWithValue("PROVISIONING_INTERFACE", "ensp0"), envWithValue("PROVISIONING_IP", "172.30.20.3/24")),
containers["metal3-ramdisk-logs"],
withEnv(containers["metal3-static-ip-manager"], envWithValue("PROVISIONING_INTERFACE", "ensp0"), envWithValue("PROVISIONING_IP", "172.30.20.3")),
withEnv(containers["metal3-static-ip-manager"], envWithValue("PROVISIONING_INTERFACE", "ensp0"), envWithValue("PROVISIONING_IP", "172.30.20.3/24")),
withEnv(containers["metal3-dnsmasq"], envWithValue("PROVISIONING_INTERFACE", "ensp0"), envWithValue("DHCP_RANGE", "")),
},
sshkey: "",
Expand Down