Add conversions to make tests pass

Author: bilbobrovall

api/v1alpha6/conversion.go

@@ -61,6 +61,11 @@ func restorev1alpha7MachineSpec(previous *infrav1.OpenStackMachineSpec, dst *inf
 	// We restore the whole Ports since they are anyway immutable.
 	dst.Ports = previous.Ports
 	dst.AdditionalBlockDevices = previous.AdditionalBlockDevices
+	dst.FloatingAddressFromPool = previous.FloatingAddressFromPool
+}
+
+func restorev1alpha7MachineStatus(previous *infrav1.OpenStackMachineStatus, dst *infrav1.OpenStackMachineStatus) {
+	dst.FloatingAddressFromPoolReady = previous.FloatingAddressFromPoolReady
 }
 
 func restorev1alpha7Bastion(previous **infrav1.Bastion, dst **infrav1.Bastion) {
@@ -261,6 +266,12 @@ var v1alpha7OpenStackMachineRestorer = conversion.RestorerFor[*infrav1.OpenStack
 		},
 		RestoreField: restorev1alpha7MachineSpec,
 	},
+	"status": conversion.HashedFieldRestorer[*infrav1.OpenStackMachine, infrav1.OpenStackMachineStatus]{
+		GetField: func(c *infrav1.OpenStackMachine) *infrav1.OpenStackMachineStatus {
+			return &c.Status
+		},
+		RestoreField: restorev1alpha7MachineStatus,
+	},
 }
 
 func (r *OpenStackMachine) ConvertTo(dstRaw ctrlconversion.Hub) error {

api/v1alpha7/openstackmachine_types.go

@@ -113,7 +113,7 @@ type OpenStackMachineStatus struct {
 
 	// FloatingAddressFromPoolReady is true when the FloatingIP is ready.
 	// +optional
-	FloatingAddressFromPoolReady bool `json:"floatingAddressFromPoolReady"`
+	FloatingAddressFromPoolReady *bool `json:"floatingAddressFromPoolReady,omitempty"`
 
 	// Addresses contains the OpenStack instance associated addresses.
 	Addresses []corev1.NodeAddress `json:"addresses,omitempty"`

api/v1alpha7/zz_generated.deepcopy.go

@@ -303,7 +303,7 @@ func (r *OpenStackMachineReconciler) reconcileDelete(scope scope.Scope, cluster
 func (r *OpenStackMachineReconciler) reconcileFloatingAddressFromPool(ctx context.Context, scope scope.Scope, openStackMachine *infrav1.OpenStackMachine, openStackCluster *infrav1.OpenStackCluster, instanceStatus *compute.InstanceStatus, instanceNS *compute.InstanceNetworkStatus) error {
 	if openStackMachine.Spec.FloatingAddressFromPool == nil {
 		conditions.MarkTrue(openStackMachine, infrav1.FloatingAddressFromPoolReadyCondition)
-		openStackMachine.Status.FloatingAddressFromPoolReady = true
+		openStackMachine.Status.FloatingAddressFromPoolReady = pointer.BoolPtr(true)
 		return nil
 	}
 
@@ -362,7 +362,7 @@ func (r *OpenStackMachineReconciler) reconcileFloatingAddressFromPool(ctx contex
 		instanceAddresses := instanceNS.Addresses()
 		for _, instanceAddress := range instanceAddresses {
 			if instanceAddress.Address == address.Spec.Address {
-				openStackMachine.Status.FloatingAddressFromPoolReady = true
+				openStackMachine.Status.FloatingAddressFromPoolReady = pointer.BoolPtr(true)
 				conditions.MarkTrue(openStackMachine, infrav1.FloatingAddressFromPoolReadyCondition)
 				return nil
 			}
@@ -391,11 +391,11 @@ func (r *OpenStackMachineReconciler) reconcileFloatingAddressFromPool(ctx contex
 				return err
 			}
 		}
-		openStackMachine.Status.FloatingAddressFromPoolReady = true
+		openStackMachine.Status.FloatingAddressFromPoolReady = pointer.BoolPtr(true)
 		conditions.MarkTrue(openStackMachine, infrav1.FloatingAddressFromPoolReadyCondition)
 	} else {
 		scope.Logger().Info("Waiting for IPAddressClaim to be allocated", "name", claim.Name)
-		openStackMachine.Status.FloatingAddressFromPoolReady = false
+		openStackMachine.Status.FloatingAddressFromPoolReady = pointer.BoolPtr(false)
 		conditions.MarkFalse(openStackMachine, infrav1.FloatingAddressFromPoolReadyCondition, infrav1.FloatingAddressFromPoolWaitingForIpamProviderReason, clusterv1.ConditionSeverityWarning, "")
 	}
 	return nil
@@ -496,7 +496,7 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, scope
 
 	switch instanceStatus.State() {
 	case infrav1.InstanceStateActive:
-		if openStackMachine.Status.FloatingAddressFromPoolReady {
+		if pointer.BoolDeref(openStackMachine.Status.FloatingAddressFromPoolReady, false) {
 			scope.Logger().Info("Machine instance state is ACTIVE", "id", instanceStatus.ID())
 			conditions.MarkTrue(openStackMachine, infrav1.InstanceReadyCondition)
 		} else {