Merge pull request #1116 from rabi/preprovNetwork

Remove PreprovisioningNetworkDataName
openstack-k8s-operators · Oct 5, 2024 · 7ce7b6a · 7ce7b6a
2 parents cb82998 + 0d03aea
commit 7ce7b6a
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 19 deletions.
diff --git a/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
@@ -1197,8 +1197,6 @@ spec:
                         - subnetName
                         type: object
                       type: array
-                    preprovisioningNetworkDataName:
-                      type: string
                     userData:
                       properties:
                         name:

diff --git a/apis/dataplane/v1beta1/common.go b/apis/dataplane/v1beta1/common.go
@@ -130,10 +130,6 @@ type NodeSection struct {
 	// ManagementNetwork - Name of network to use for management (SSH/Ansible)
 	// +kubebuilder:validation:Optional
 	ManagementNetwork string `json:"managementNetwork,omitempty"`
-
-	// +kubebuilder:validation:Optional
-	// PreprovisioningNetworkDataName - NetworkData secret name in the local namespace for pre-provisioing
-	PreprovisioningNetworkDataName string `json:"preprovisioningNetworkDataName,omitempty"`
 }
 
 // NodeTemplate is a specification of the node attributes that override top level attributes.

diff --git a/apis/dataplane/v1beta1/openstackdataplanenodeset_webhook.go b/apis/dataplane/v1beta1/openstackdataplanenodeset_webhook.go
@@ -93,7 +93,6 @@ func (spec *OpenStackDataPlaneNodeSetSpec) Default() {
 			instanceSpec.BmhLabelSelector = node.BmhLabelSelector
 			instanceSpec.UserData = node.UserData
 			instanceSpec.NetworkData = node.NetworkData
-			instanceSpec.PreprovisioningNetworkDataName = node.PreprovisioningNetworkDataName
 			nodeSetHostMap[node.HostName] = instanceSpec
 		}
 		spec.BaremetalSetTemplate.BaremetalHosts = nodeSetHostMap

diff --git a/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
@@ -1197,8 +1197,6 @@ spec:
                         - subnetName
                         type: object
                       type: array
-                    preprovisioningNetworkDataName:
-                      type: string
                     userData:
                       properties:
                         name:

diff --git a/tests/functional/dataplane/openstackdataplanenodeset_controller_test.go b/tests/functional/dataplane/openstackdataplanenodeset_controller_test.go
@@ -255,8 +255,6 @@ var _ = Describe("Dataplane NodeSet Test", func() {
 					BaremetalSetTemplate: baremetalv1.OpenStackBaremetalSetSpec{
 						BaremetalHosts:        nil,
 						OSImage:               "",
-						UserData:              nil,
-						NetworkData:           nil,
 						AutomatedCleaningMode: "metadata",
 						ProvisionServerName:   "",
 						ProvisioningInterface: "",
@@ -294,8 +292,6 @@ var _ = Describe("Dataplane NodeSet Test", func() {
 							AnsibleVars: nil,
 						},
 						ExtraMounts: nil,
-						UserData:    nil,
-						NetworkData: nil,
 						Networks: []infrav1.IPSetNetwork{{
 							Name:       "ctlplane",
 							SubnetName: "subnet1",
@@ -393,8 +389,6 @@ var _ = Describe("Dataplane NodeSet Test", func() {
 					BaremetalSetTemplate: baremetalv1.OpenStackBaremetalSetSpec{
 						BaremetalHosts:        nil,
 						OSImage:               "",
-						UserData:              nil,
-						NetworkData:           nil,
 						AutomatedCleaningMode: "metadata",
 						ProvisionServerName:   "",
 						ProvisioningInterface: "",
@@ -437,8 +431,6 @@ var _ = Describe("Dataplane NodeSet Test", func() {
 							AnsibleVars: nil,
 						},
 						ExtraMounts: nil,
-						UserData:    nil,
-						NetworkData: nil,
 					},
 					Env:                nil,
 					PreProvisioned:     true,
@@ -839,8 +831,6 @@ var _ = Describe("Dataplane NodeSet Test", func() {
 					BaremetalSetTemplate: baremetalv1.OpenStackBaremetalSetSpec{
 						BaremetalHosts:        nil,
 						OSImage:               "",
-						UserData:              nil,
-						NetworkData:           nil,
 						AutomatedCleaningMode: "metadata",
 						ProvisionServerName:   "",
 						ProvisioningInterface: "",