Merge pull request #251 from bshephar/optional-default-netmask

Remove default for optional CtlplaneNetmask
openstack-k8s-operators · Jan 3, 2025 · 34b0d04 · 34b0d04
2 parents d71f438 + 193c905
commit 34b0d04
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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{