Move subnet options to SubnetSpec

This commit introduces SubnetSpec field onto the OpenStackClusterSpec
that is supposed to hold all options related to subnets created by CAPO.
This means nodeCidr and DNSNameservers are moved into that struct.

Author: dulek

api/v1alpha5/conversion.go

@@ -196,6 +196,11 @@ func Convert_v1alpha8_OpenStackClusterSpec_To_v1alpha5_OpenStackClusterSpec(in *
 		out.ExternalNetworkID = in.ExternalNetwork.ID
 	}
 
+	if len(in.NodeCIDRs) > 0 {
+		out.NodeCIDR = in.NodeCIDRs[0].CIDR
+		out.DNSNameservers = in.NodeCIDRs[0].DNSNameservers
+	}
+
 	if in.Subnets != nil {
 		if len(in.Subnets) >= 1 {
 			if err := Convert_v1alpha8_SubnetFilter_To_v1alpha5_SubnetFilter(&in.Subnets[0], &out.Subnet, s); err != nil {
@@ -228,6 +233,16 @@ func Convert_v1alpha5_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(in *
 		out.Subnets = []infrav1.SubnetFilter{subnet}
 	}
 
+	if len(in.NodeCIDR) > 0 {
+		out.NodeCIDRs = []infrav1.SubnetSpec{
+			{
+				CIDR:           in.NodeCIDR,
+				DNSNameservers: in.DNSNameservers,
+			},
+		}
+	}
+	// We're dropping DNSNameservers even if these were set as without NodeCIDR it doesn't make sense.
+
 	return nil
 }
 

api/v1alpha5/zz_generated.conversion.go

@@ -94,6 +94,10 @@ func restorev1alpha8ClusterStatus(previous *infrav1.OpenStackClusterStatus, dst
 	}
 }
 
+func restorev1alpha8ClusterSpec(previous *infrav1.OpenStackClusterSpec, dst *infrav1.OpenStackClusterSpec) {
+	dst.NodeCIDRs = previous.NodeCIDRs
+}
+
 func restorev1alpha6ClusterSpec(previous *OpenStackClusterSpec, dst *OpenStackClusterSpec) {
 	for i := range previous.ExternalRouterIPs {
 		dstIP := &dst.ExternalRouterIPs[i]
@@ -109,6 +113,11 @@ func restorev1alpha6ClusterSpec(previous *OpenStackClusterSpec, dst *OpenStackCl
 		}
 	}
 
+	// We only restore DNSNameservers when these were lossly converted when NodeCIDR is empty.
+	if len(previous.DNSNameservers) > 0 && len(dst.NodeCIDR) == 0 {
+		dst.DNSNameservers = previous.DNSNameservers
+	}
+
 	prevBastion := previous.Bastion
 	dstBastion := dst.Bastion
 	if prevBastion != nil && dstBastion != nil {
@@ -172,6 +181,12 @@ var v1alpha8OpenStackClusterRestorer = conversion.RestorerFor[*infrav1.OpenStack
 		},
 		restorev1alpha8ClusterStatus,
 	),
+	"spec": conversion.HashedFieldRestorer(
+		func(c *infrav1.OpenStackCluster) *infrav1.OpenStackClusterSpec {
+			return &c.Spec
+		},
+		restorev1alpha8ClusterSpec,
+	),
 }
 
 func (r *OpenStackCluster) ConvertTo(dstRaw ctrlconversion.Hub) error {
@@ -510,6 +525,11 @@ func Convert_v1alpha8_OpenStackClusterSpec_To_v1alpha6_OpenStackClusterSpec(in *
 		}
 	}
 
+	if len(in.NodeCIDRs) > 0 {
+		out.NodeCIDR = in.NodeCIDRs[0].CIDR
+		out.DNSNameservers = in.NodeCIDRs[0].DNSNameservers
+	}
+
 	return nil
 }
 
@@ -534,6 +554,16 @@ func Convert_v1alpha6_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(in *
 		out.Subnets = []infrav1.SubnetFilter{subnet}
 	}
 
+	// DNSNameservers without NodeCIDR doesn't make sense, so we drop that.
+	if len(in.NodeCIDR) > 0 {
+		out.NodeCIDRs = []infrav1.SubnetSpec{
+			{
+				CIDR:           in.NodeCIDR,
+				DNSNameservers: in.DNSNameservers,
+			},
+		}
+	}
+
 	return nil
 }
 

api/v1alpha6/conversion.go

@@ -101,6 +101,16 @@ func TestFuzzyConversion(t *testing.T) {
 					spec.Subnets = append(spec.Subnets, subnet)
 				}
 			},
+
+			func(spec *infrav1.SubnetSpec, c fuzz.Continue) {
+				c.FuzzNoCustom(spec)
+
+				// CIDR is required and API validates that it's present, so
+				// we force it to always be set.
+				if len(spec.CIDR) == 0 {
+					spec.CIDR = c.RandString()
+				}
+			},
 		}
 	}
 

api/v1alpha6/conversion_test.go

@@ -26,7 +26,26 @@ import (
 
 var _ ctrlconversion.Convertible = &OpenStackCluster{}
 
-var v1alpha7OpenStackClusterRestorer = conversion.RestorerFor[*OpenStackCluster]{}
+var v1alpha7OpenStackClusterRestorer = conversion.RestorerFor[*OpenStackCluster]{
+	"spec": conversion.HashedFieldRestorer(
+		func(c *OpenStackCluster) *OpenStackClusterSpec {
+			return &c.Spec
+		},
+		restorev1alpha7ClusterSpec,
+
+		// Filter out Bastion, which is restored separately
+		conversion.HashedFilterField[*OpenStackCluster, OpenStackClusterSpec](
+			func(s *OpenStackClusterSpec) *OpenStackClusterSpec {
+				if s.Bastion != nil {
+					f := *s
+					f.Bastion = nil
+					return &f
+				}
+				return s
+			},
+		),
+	),
+}
 
 var v1alpha8OpenStackClusterRestorer = conversion.RestorerFor[*infrav1.OpenStackCluster]{
 	"bastion": conversion.HashedFieldRestorer(
@@ -80,6 +99,19 @@ func restorev1alpha8Bastion(previous **infrav1.Bastion, dst **infrav1.Bastion) {
 	}
 }
 
+func restorev1alpha7ClusterSpec(previous *OpenStackClusterSpec, dst *OpenStackClusterSpec) {
+	prevBastion := previous.Bastion
+	dstBastion := dst.Bastion
+	if prevBastion != nil && dstBastion != nil {
+		restorev1alpha7MachineSpec(&prevBastion.Instance, &dstBastion.Instance)
+	}
+
+	// We only restore DNSNameservers when these were lossly converted when NodeCIDR is empty.
+	if len(previous.DNSNameservers) > 0 && len(dst.NodeCIDR) == 0 {
+		dst.DNSNameservers = previous.DNSNameservers
+	}
+}
+
 func restorev1alpha8ClusterSpec(previous *infrav1.OpenStackClusterSpec, dst *infrav1.OpenStackClusterSpec) {
 	prevBastion := previous.Bastion
 	dstBastion := dst.Bastion
@@ -101,6 +133,8 @@ func restorev1alpha8ClusterSpec(previous *infrav1.OpenStackClusterSpec, dst *inf
 	if len(previous.Subnets) > 1 {
 		dst.Subnets = append(dst.Subnets, previous.Subnets[1:]...)
 	}
+
+	dst.NodeCIDRs = previous.NodeCIDRs
 }
 
 func (r *OpenStackCluster) ConvertTo(dstRaw ctrlconversion.Hub) error {
@@ -144,7 +178,18 @@ func restorev1alpha8ClusterTemplateSpec(previous *infrav1.OpenStackClusterTempla
 	restorev1alpha8ClusterSpec(&previous.Template.Spec, &dst.Template.Spec)
 }
 
-var v1alpha7OpenStackClusterTemplateRestorer = conversion.RestorerFor[*OpenStackClusterTemplate]{}
+func restorev1alpha7ClusterTemplateSpec(previous *OpenStackClusterTemplateSpec, dst *OpenStackClusterTemplateSpec) {
+	restorev1alpha7ClusterSpec(&previous.Template.Spec, &dst.Template.Spec)
+}
+
+var v1alpha7OpenStackClusterTemplateRestorer = conversion.RestorerFor[*OpenStackClusterTemplate]{
+	"spec": conversion.HashedFieldRestorer(
+		func(c *OpenStackClusterTemplate) *OpenStackClusterTemplateSpec {
+			return &c.Spec
+		},
+		restorev1alpha7ClusterTemplateSpec,
+	),
+}
 
 var v1alpha8OpenStackClusterTemplateRestorer = conversion.RestorerFor[*infrav1.OpenStackClusterTemplate]{
 	"spec": conversion.HashedFieldRestorer(
@@ -396,6 +441,16 @@ func Convert_v1alpha7_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(in *
 		out.Subnets = []infrav1.SubnetFilter{subnet}
 	}
 
+	// DNSNameservers without NodeCIDR doesn't make sense, so we drop that.
+	if len(in.NodeCIDR) > 0 {
+		out.NodeCIDRs = []infrav1.SubnetSpec{
+			{
+				CIDR:           in.NodeCIDR,
+				DNSNameservers: in.DNSNameservers,
+			},
+		}
+	}
+
 	return nil
 }
 
@@ -415,5 +470,10 @@ func Convert_v1alpha8_OpenStackClusterSpec_To_v1alpha7_OpenStackClusterSpec(in *
 		}
 	}
 
+	if len(in.NodeCIDRs) > 0 {
+		out.NodeCIDR = in.NodeCIDRs[0].CIDR
+		out.DNSNameservers = in.NodeCIDRs[0].DNSNameservers
+	}
+
 	return nil
 }

api/v1alpha6/zz_generated.conversion.go

@@ -69,6 +69,16 @@ func TestFuzzyConversion(t *testing.T) {
 					spec.Subnets = append(spec.Subnets, subnet)
 				}
 			},
+
+			func(spec *infrav1.SubnetSpec, c fuzz.Continue) {
+				c.FuzzNoCustom(spec)
+
+				// CIDR is required and API validates that it's present, so
+				// we force it to always be set.
+				if len(spec.CIDR) == 0 {
+					spec.CIDR = c.RandString()
+				}
+			},
 		}
 	}
 

api/v1alpha7/conversion.go

@@ -34,10 +34,11 @@ type OpenStackClusterSpec struct {
 	// +optional
 	CloudName string `json:"cloudName"`
 
-	// NodeCIDR is the OpenStack Subnet to be created. Cluster actuator will create a
-	// network, a subnet with NodeCIDR, and a router connected to this subnet.
+	// NodeCIDRs are describing OpenStack Subnets to be created. Cluster actuator
+	// will create a network, subnets with NodeCIDR, and a router connected to these subnets.
+	// Currently only one IPv4 subnet is supported.
 	// If you leave this empty, no network will be created.
-	NodeCIDR string `json:"nodeCidr,omitempty"`
+	NodeCIDRs []SubnetSpec `json:"nodeCIDRs,omitempty"`
 
 	// If NodeCIDR is set this option can be used to detect an existing router.
 	// If specified, no new router will be created.
@@ -58,11 +59,6 @@ type OpenStackClusterSpec struct {
 	// +optional
 	NetworkMTU int `json:"networkMtu,omitempty"`
 
-	// DNSNameservers is the list of nameservers for OpenStack Subnet being created.
-	// Set this value when you need create a new network/subnet while the access
-	// through DNS is required.
-	// +listType=set
-	DNSNameservers []string `json:"dnsNameservers,omitempty"`
 	// ExternalRouterIPs is an array of externalIPs on the respective subnets.
 	// This is necessary if the router needs a fixed ip in a specific subnet.
 	ExternalRouterIPs []ExternalRouterIPParam `json:"externalRouterIPs,omitempty"`

api/v1alpha7/conversion_test.go

@@ -87,6 +87,12 @@ type RouterFilter struct {
 	NotTagsAny  string `json:"notTagsAny,omitempty"`
 }
 
+type SubnetSpec struct {
+	// +required
+	CIDR           string   `json:"cidr"`
+	DNSNameservers []string `json:"dnsNameservers,omitempty"`
+}
+
 type PortOpts struct {
 	// Network is a query for an openstack network that the port will be created or discovered on.
 	// This will fail if the query returns more than one network.