Merge pull request openstack-k8s-operators#409 from rabi/change_crd

Move nodes to top level of nodeset spec
bshephar · Sep 13, 2023 · d984646 · d984646
2 parents 2a4ab82 + cea7e5e
commit d984646
Show file tree

Hide file tree

Showing 29 changed files with 1,696 additions and 1,703 deletions.
diff --git a/api/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/api/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
diff --git a/api/v1beta1/common.go b/api/v1beta1/common.go
@@ -93,11 +93,6 @@ type NodeTemplate struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:io.kubernetes:Secret"}
 	AnsibleSSHPrivateKeySecret string `json:"ansibleSSHPrivateKeySecret"`
 
-	// Nodes - Map of Node Names and node specific data. Values here override defaults in the
-	// upper level section.
-	// +kubebuilder:validation:Required
-	Nodes map[string]NodeSection `json:"nodes"`
-
 	// NetworkConfig - Network configuration details. Contains os-net-config
 	// related properties.
 	// +kubebuilder:validation:Optional

diff --git a/api/v1beta1/openstackdataplanenodeset_types.go b/api/v1beta1/openstackdataplanenodeset_types.go
@@ -37,6 +37,11 @@ type OpenStackDataPlaneNodeSetSpec struct {
 	// from valus in this section.
 	NodeTemplate NodeTemplate `json:"nodeTemplate"`
 
+	// Nodes - Map of Node Names and node specific data. Values here override defaults in the
+	// upper level section.
+	// +kubebuilder:validation:Required
+	Nodes map[string]NodeSection `json:"nodes"`
+
 	// +kubebuilder:validation:Optional
 	//
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:booleanSwitch"}

diff --git a/api/v1beta1/openstackdataplanenodeset_webhook.go b/api/v1beta1/openstackdataplanenodeset_webhook.go
@@ -48,11 +48,11 @@ func (r *OpenStackDataPlaneNodeSet) Default() {
 
 // Default - set defaults for this OpenStackDataPlaneNodeSet Spec
 func (spec *OpenStackDataPlaneNodeSetSpec) Default() {
-	for nodeName, node := range spec.NodeTemplate.Nodes {
+	for nodeName, node := range spec.Nodes {
 		if node.HostName == "" {
 			node.HostName = nodeName
 		}
-		spec.NodeTemplate.Nodes[nodeName] = *node.DeepCopy()
+		spec.Nodes[nodeName] = *node.DeepCopy()
 	}
 
 	if spec.BaremetalSetTemplate.DeploymentSSHSecret == "" {
@@ -61,7 +61,7 @@ func (spec *OpenStackDataPlaneNodeSetSpec) Default() {
 
 	if !spec.PreProvisioned && spec.BaremetalSetTemplate.BaremetalHosts == nil {
 		nodeSetHostMap := make(map[string]baremetalv1.InstanceSpec)
-		for _, node := range spec.NodeTemplate.Nodes {
+		for _, node := range spec.Nodes {
 			instanceSpec := baremetalv1.InstanceSpec{}
 			instanceSpec.UserData = node.UserData
 			instanceSpec.NetworkData = node.NetworkData

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go