OpenStackClusterSpec: APIServerFloatingIP, APIServerFixedIP, APIServerPort->optional

Affects go marshalling only.

Author: mdbooth

api/v1alpha5/conversion.go

@@ -291,6 +291,18 @@ func Convert_v1alpha5_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(in *O
 		out.IdentityRef.Name = in.IdentityRef.Name
 	}
 
+	// The generated conversion function converts "" to &"" which is not what we want
+	if in.APIServerFloatingIP == "" {
+		out.APIServerFloatingIP = nil
+	}
+	if in.APIServerFixedIP == "" {
+		out.APIServerFixedIP = nil
+	}
+
+	if in.APIServerPort != 0 {
+		out.APIServerPort = pointer.Int(in.APIServerPort)
+	}
+
 	return nil
 }
 

api/v1alpha5/zz_generated.conversion.go

@@ -24,6 +24,7 @@ import (
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/conversion"
+	optional "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/optional"
 )
 
 var _ ctrlconversion.Convertible = &OpenStackCluster{}
@@ -199,6 +200,10 @@ func restorev1beta1ClusterSpec(previous *infrav1.OpenStackClusterSpec, dst *infr
 	if dst.APIServerLoadBalancer.IsZero() {
 		dst.APIServerLoadBalancer = previous.APIServerLoadBalancer
 	}
+
+	optional.RestoreString(&previous.APIServerFloatingIP, &dst.APIServerFloatingIP)
+	optional.RestoreString(&previous.APIServerFixedIP, &dst.APIServerFixedIP)
+	optional.RestoreInt(&previous.APIServerPort, &dst.APIServerPort)
 }
 
 func Convert_v1alpha6_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(in *OpenStackClusterSpec, out *infrav1.OpenStackClusterSpec, s apiconversion.Scope) error {

api/v1alpha6/openstackcluster_conversion.go

@@ -22,6 +22,7 @@ import (
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/conversion"
+	"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/optional"
 )
 
 var _ ctrlconversion.Convertible = &OpenStackCluster{}
@@ -201,6 +202,10 @@ func restorev1beta1ClusterSpec(previous *infrav1.OpenStackClusterSpec, dst *infr
 	if dst.APIServerLoadBalancer.IsZero() {
 		dst.APIServerLoadBalancer = previous.APIServerLoadBalancer
 	}
+
+	optional.RestoreString(&previous.APIServerFloatingIP, &dst.APIServerFloatingIP)
+	optional.RestoreString(&previous.APIServerFixedIP, &dst.APIServerFixedIP)
+	optional.RestoreInt(&previous.APIServerPort, &dst.APIServerPort)
 }
 
 func Convert_v1alpha7_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(in *OpenStackClusterSpec, out *infrav1.OpenStackClusterSpec, s apiconversion.Scope) error {

api/v1alpha6/zz_generated.conversion.go

@@ -20,6 +20,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	capierrors "sigs.k8s.io/cluster-api/errors"
+
+	"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/optional"
 )
 
 const (
@@ -116,7 +118,8 @@ type OpenStackClusterSpec struct {
 	// The floatingIP will be created if it does not already exist.
 	// If not specified, a new floatingIP is allocated.
 	// This field is not used if DisableAPIServerFloatingIP is set to true.
-	APIServerFloatingIP string `json:"apiServerFloatingIP,omitempty"`
+	// +optional
+	APIServerFloatingIP optional.String `json:"apiServerFloatingIP,omitempty"`
 
 	// APIServerFixedIP is the fixed IP which will be associated with the API server.
 	// In the case where the API server has a floating IP but not a managed load balancer,
@@ -126,11 +129,13 @@ type OpenStackClusterSpec struct {
 	// If a managed load balancer is not used AND the API server floating IP is disabled,
 	// this field MUST be specified and should correspond to a pre-allocated port that
 	// holds the fixed IP to be used as a VIP.
-	APIServerFixedIP string `json:"apiServerFixedIP,omitempty"`
+	// +optional
+	APIServerFixedIP optional.String `json:"apiServerFixedIP,omitempty"`
 
 	// APIServerPort is the port on which the listener on the APIServer
 	// will be created
-	APIServerPort int `json:"apiServerPort,omitempty"`
+	// +optional
+	APIServerPort optional.Int `json:"apiServerPort,omitempty"`
 
 	// ManagedSecurityGroups determines whether OpenStack security groups for the cluster
 	// will be managed by the OpenStack provider or whether pre-existing security groups will

api/v1alpha7/openstackcluster_conversion.go

@@ -464,10 +464,14 @@ func reconcileBastion(scope *scope.WithLogger, cluster *clusterv1.Cluster, openS
 		return ctrl.Result{}, nil
 	}
 
-	floatingIP := openStackCluster.Spec.Bastion.FloatingIP
-	if openStackCluster.Status.Bastion.FloatingIP != "" {
+	var floatingIP *string
+	switch {
+	case openStackCluster.Status.Bastion.FloatingIP != "":
 		// Some floating IP has already been created for this bastion, make sure we re-use it
-		floatingIP = openStackCluster.Status.Bastion.FloatingIP
+		floatingIP = &openStackCluster.Status.Bastion.FloatingIP
+	case openStackCluster.Spec.Bastion.FloatingIP != "":
+		// Use floating IP from the spec
+		floatingIP = &openStackCluster.Spec.Bastion.FloatingIP
 	}
 	// Check if there is an existing floating IP attached to bastion, in case where FloatingIP would not yet have been stored in cluster status
 	fp, err = networkingService.GetOrCreateFloatingIP(openStackCluster, openStackCluster, clusterName, floatingIP)
@@ -760,8 +764,8 @@ func reconcileControlPlaneEndpoint(scope *scope.WithLogger, networkingService *n
 	// plane floating IP. In this case we configure APIServerFixedIP as the
 	// control plane endpoint and leave it to the user to configure load
 	// balancing.
-	case openStackCluster.Spec.APIServerFixedIP != "":
-		host = openStackCluster.Spec.APIServerFixedIP
+	case openStackCluster.Spec.APIServerFixedIP != nil:
+		host = *openStackCluster.Spec.APIServerFixedIP
 
 	// Control plane endpoint is not set, and none can be created
 	default:
@@ -783,8 +787,8 @@ func getAPIServerPort(openStackCluster *infrav1.OpenStackCluster) int {
 	switch {
 	case openStackCluster.Spec.ControlPlaneEndpoint.IsValid():
 		return int(openStackCluster.Spec.ControlPlaneEndpoint.Port)
-	case openStackCluster.Spec.APIServerPort != 0:
-		return openStackCluster.Spec.APIServerPort
+	case openStackCluster.Spec.APIServerPort != nil:
+		return *openStackCluster.Spec.APIServerPort
 	}
 	return 6443
 }

api/v1alpha7/zz_generated.conversion.go

@@ -521,7 +521,7 @@ var _ = Describe("OpenStackCluster controller", func() {
 				Enabled: true,
 			},
 			DisableAPIServerFloatingIP: true,
-			APIServerFixedIP:           "10.0.0.1",
+			APIServerFixedIP:           pointer.String("10.0.0.1"),
 			ExternalNetwork: &infrav1.NetworkFilter{
 				ID: externalNetworkID,
 			},
@@ -601,7 +601,7 @@ var _ = Describe("OpenStackCluster controller", func() {
 				Enabled: true,
 			},
 			DisableAPIServerFloatingIP: true,
-			APIServerFixedIP:           "10.0.0.1",
+			APIServerFixedIP:           pointer.String("10.0.0.1"),
 			ExternalNetwork: &infrav1.NetworkFilter{
 				ID: externalNetworkID,
 			},
@@ -683,7 +683,7 @@ var _ = Describe("OpenStackCluster controller", func() {
 		testCluster.SetName("subnet-filtering")
 		testCluster.Spec = infrav1.OpenStackClusterSpec{
 			DisableAPIServerFloatingIP: true,
-			APIServerFixedIP:           "10.0.0.1",
+			APIServerFixedIP:           pointer.String("10.0.0.1"),
 			DisableExternalNetwork:     true,
 			Subnets: []infrav1.SubnetFilter{
 				{ID: clusterSubnetID},
@@ -777,7 +777,7 @@ func Test_getAPIServerPort(t *testing.T) {
 			name: "with API server port",
 			openStackCluster: &infrav1.OpenStackCluster{
 				Spec: infrav1.OpenStackClusterSpec{
-					APIServerPort: 6445,
+					APIServerPort: pointer.Int(6445),
 				},
 			},
 			want: 6445,