Merge pull request kubernetes-sigs#1530 from Jeremy-Boyle/backport-ovn-v1alpha6

🐛 Patch: Backport Provider to v1alpha6

Author: k8s-ci-robot

api/v1alpha5/conversion.go

@@ -237,6 +237,6 @@ func Convert_v1alpha5_OpenStackMachineSpec_To_v1alpha7_OpenStackMachineSpec(in *
 }
 
 func Convert_v1alpha7_APIServerLoadBalancer_To_v1alpha5_APIServerLoadBalancer(in *infrav1.APIServerLoadBalancer, out *APIServerLoadBalancer, s conversion.Scope) error {
-	// Provider have been added in v1alpha7 but have no equivalent in v1alpha5
+	// Provider was originally added in v1alpha7, but was backported to v1alpha6, but has no equivalent in v1alpha5
 	return autoConvert_v1alpha7_APIServerLoadBalancer_To_v1alpha5_APIServerLoadBalancer(in, out, s)
 }

api/v1alpha6/conversion.go

@@ -291,11 +291,6 @@ func Convert_v1alpha6_OpenStackMachineSpec_To_v1alpha7_OpenStackMachineSpec(in *
 	return autoConvert_v1alpha6_OpenStackMachineSpec_To_v1alpha7_OpenStackMachineSpec(in, out, s)
 }
 
-func Convert_v1alpha7_APIServerLoadBalancer_To_v1alpha6_APIServerLoadBalancer(in *infrav1.APIServerLoadBalancer, out *APIServerLoadBalancer, s conversion.Scope) error {
-	// Provider have been added in v1alpha7 but have no equivalent in v1alpha6
-	return autoConvert_v1alpha7_APIServerLoadBalancer_To_v1alpha6_APIServerLoadBalancer(in, out, s)
-}
-
 func Convert_v1alpha7_OpenStackClusterSpec_To_v1alpha6_OpenStackClusterSpec(in *infrav1.OpenStackClusterSpec, out *OpenStackClusterSpec, s conversion.Scope) error {
 	return autoConvert_v1alpha7_OpenStackClusterSpec_To_v1alpha6_OpenStackClusterSpec(in, out, s)
 }

api/v1alpha6/types.go

@@ -323,6 +323,8 @@ type APIServerLoadBalancer struct {
 	AdditionalPorts []int `json:"additionalPorts,omitempty"`
 	// AllowedCIDRs restrict access to all API-Server listeners to the given address CIDRs.
 	AllowedCIDRs []string `json:"allowedCidrs,omitempty"`
+	// Octavia Provider Used to create load balancer
+	Provider string `json:"provider,omitempty"`
 }
 
 // ValueSpec represents a single value_spec key-value pair.

api/v1alpha6/zz_generated.conversion.go

@@ -4283,6 +4283,9 @@ spec:
                     description: Enabled defines whether a load balancer should be
                       created.
                     type: boolean
+                  provider:
+                    description: Octavia Provider Used to create load balancer
+                    type: string
                 type: object
               apiServerPort:
                 description: APIServerPort is the port on which the listener on the

config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml

@@ -1508,6 +1508,9 @@ spec:
                             description: Enabled defines whether a load balancer should
                               be created.
                             type: boolean
+                          provider:
+                            description: Octavia Provider Used to create load balancer
+                            type: string
                         type: object
                       apiServerPort:
                         description: APIServerPort is the port on which the listener