From 193c90569024951d0651534126b9a9132dab07a2 Mon Sep 17 00:00:00 2001 From: Brendan Shephard Date: Fri, 3 Jan 2025 11:21:44 +1000 Subject: [PATCH] Remove default for optional CtlplaneNetmask Since this parameter is optional, we shouldn't set a default. This change removes the default for the param which will allow us to entirely remove the unused parameter once other projects have removed references to it. Related: https://issues.redhat.com/browse/OSPRH-12304 Signed-off-by: Brendan Shephard --- api/bases/baremetal.openstack.org_openstackbaremetalsets.yaml | 1 - api/v1beta1/openstackbaremetalset_types.go | 1 - .../bases/baremetal.openstack.org_openstackbaremetalsets.yaml | 1 - tests/functional/openstackbaremetalset_controller_test.go | 1 - 4 files changed, 4 deletions(-) diff --git a/api/bases/baremetal.openstack.org_openstackbaremetalsets.yaml b/api/bases/baremetal.openstack.org_openstackbaremetalsets.yaml index 9f386b3..c9a2b0b 100644 --- a/api/bases/baremetal.openstack.org_openstackbaremetalsets.yaml +++ b/api/bases/baremetal.openstack.org_openstackbaremetalsets.yaml @@ -144,7 +144,6 @@ spec: to use for ctlplane network type: string ctlplaneNetmask: - default: 255.255.255.0 description: 'CtlplaneNetmask - Netmask to use for ctlplane network (TODO: acquire this is another manner?)' type: string diff --git a/api/v1beta1/openstackbaremetalset_types.go b/api/v1beta1/openstackbaremetalset_types.go index 950c1e3..962d48b 100644 --- a/api/v1beta1/openstackbaremetalset_types.go +++ b/api/v1beta1/openstackbaremetalset_types.go @@ -88,7 +88,6 @@ type OpenStackBaremetalSetSpec struct { // +kubebuilder:validation:Optional CtlplaneGateway string `json:"ctlplaneGateway,omitempty"` // +kubebuilder:validation:Optional - // +kubebuilder:default="255.255.255.0" // CtlplaneNetmask - Netmask to use for ctlplane network (TODO: acquire this is another manner?) CtlplaneNetmask string `json:"ctlplaneNetmask,omitempty"` // +kubebuilder:default=openshift-machine-api diff --git a/config/crd/bases/baremetal.openstack.org_openstackbaremetalsets.yaml b/config/crd/bases/baremetal.openstack.org_openstackbaremetalsets.yaml index 9f386b3..c9a2b0b 100644 --- a/config/crd/bases/baremetal.openstack.org_openstackbaremetalsets.yaml +++ b/config/crd/bases/baremetal.openstack.org_openstackbaremetalsets.yaml @@ -144,7 +144,6 @@ spec: to use for ctlplane network type: string ctlplaneNetmask: - default: 255.255.255.0 description: 'CtlplaneNetmask - Netmask to use for ctlplane network (TODO: acquire this is another manner?)' type: string diff --git a/tests/functional/openstackbaremetalset_controller_test.go b/tests/functional/openstackbaremetalset_controller_test.go index 6a20bc3..ab2ec1f 100644 --- a/tests/functional/openstackbaremetalset_controller_test.go +++ b/tests/functional/openstackbaremetalset_controller_test.go @@ -84,7 +84,6 @@ var _ = Describe("BaremetalSet Test", func() { DeploymentSSHSecret: "mysecret", CtlplaneInterface: "eth0", CtlplaneGateway: "", - CtlplaneNetmask: "255.255.255.0", BmhNamespace: baremetalSetName.Namespace, BmhLabelSelector: map[string]string{"app": "openstack"}, HardwareReqs: baremetalv1.HardwareReqs{