Add stuffs

Author: EmilienM

api/v1alpha7/conversion.go

@@ -17,6 +17,7 @@ limitations under the License.
 package v1alpha7
 
 import (
+	apiconversion "k8s.io/apimachinery/pkg/conversion"
 	ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8"
@@ -232,3 +233,27 @@ func (r *OpenStackMachineTemplateList) ConvertFrom(srcRaw ctrlconversion.Hub) er
 	src := srcRaw.(*infrav1.OpenStackMachineTemplateList)
 	return Convert_v1alpha8_OpenStackMachineTemplateList_To_v1alpha7_OpenStackMachineTemplateList(src, r, nil)
 }
+
+func Convert_v1alpha7_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(in *OpenStackClusterSpec, out *infrav1.OpenStackClusterSpec, s apiconversion.Scope) error {
+	err := autoConvert_v1alpha7_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(in, out, s)
+	if err != nil {
+		return err
+	}
+
+	out.Subnets = []infrav1.SubnetFilter{infrav1.SubnetFilter(in.Subnet)}
+
+	return nil
+}
+
+func Convert_v1alpha8_OpenStackClusterSpec_To_v1alpha7_OpenStackClusterSpec(in *infrav1.OpenStackClusterSpec, out *OpenStackClusterSpec, s apiconversion.Scope) error {
+	if len(in.Subnets) == 1 {
+		in.Subnet = infrav1.SubnetFilter(in.Subnets[0])
+	}
+
+	err := autoConvert_v1alpha8_OpenStackClusterSpec_To_v1alpha7_OpenStackClusterSpec(in, out, s)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

api/v1alpha7/openstackcluster_types.go

@@ -48,13 +48,8 @@ type OpenStackClusterSpec struct {
 	Network NetworkFilter `json:"network,omitempty"`
 
 	// If NodeCIDR cannot be set this can be used to detect an existing subnet.
-	//
-	// Deprecated: Use subnets instead. subnet will be silently ignored if subnets is set.
 	Subnet SubnetFilter `json:"subnet,omitempty"`
 
-	// If NodeCIDR cannot be set this can be used to detect existing IPv4 and/or IPv6 subnets.
-	Subnets []SubnetFilter `json:"subnets,omitempty"`
-
 	// NetworkMTU sets the maximum transmission unit (MTU) value to address fragmentation for the private network ID.
 	// This value will be used only if the Cluster actuator creates the network.
 	// If leaved empty, the network will have the default MTU defined in Openstack network service.

api/v1alpha7/zz_generated.conversion.go

@@ -48,8 +48,13 @@ type OpenStackClusterSpec struct {
 	Network NetworkFilter `json:"network,omitempty"`
 
 	// If NodeCIDR cannot be set this can be used to detect an existing subnet.
+	//
+	// Deprecated: Use subnets instead. subnet will be silently ignored if subnets is set.
 	Subnet SubnetFilter `json:"subnet,omitempty"`
 
+	// If NodeCIDR cannot be set this can be used to detect existing IPv4 and/or IPv6 subnets.
+	Subnets []SubnetFilter `json:"subnets,omitempty"`
+
 	// NetworkMTU sets the maximum transmission unit (MTU) value to address fragmentation for the private network ID.
 	// This value will be used only if the Cluster actuator creates the network.
 	// If leaved empty, the network will have the default MTU defined in Openstack network service.

api/v1alpha7/zz_generated.deepcopy.go

@@ -461,8 +461,23 @@ func reconcileNetworkComponents(scope scope.Scope, cluster *clusterv1.Cluster, o
 		openStackCluster.Status.Network.Name = networkList[0].Name
 		openStackCluster.Status.Network.Tags = networkList[0].Tags
 
+		emptySubnet := infrav1.SubnetFilter{}
+		subnets := make([]infrav1.SubnetFilter, 0)
+		if openStackCluster.Spec.Subnet != emptySubnet && openStackCluster.Spec.Subnets != nil {
+			handleUpdateOSCError(openStackCluster, fmt.Errorf("subnet and subnets cannot be specified at the same time"))
+			return fmt.Errorf("subnet and subnets cannot be specified at the same time")
+		}
+
+		if openStackCluster.Spec.Subnet != emptySubnet {
+			subnets = append(subnets, openStackCluster.Spec.Subnet)
+		}
+
+		if openStackCluster.Spec.Subnets != nil {
+			subnets = openStackCluster.Spec.Subnets
+		}
+
 		var filteredSubnets []infrav1.Subnet
-		for _, subnet := range openStackCluster.Spec.Subnets {
+		for _, subnet := range subnets {
 			filteredSubnet, err := networkingService.GetNetworkSubnetByFilter(openStackCluster.Status.Network.ID, &subnet)
 			if err != nil {
 				err = fmt.Errorf("failed to find subnet: %w", err)