re-added nil check and fixed ready condition

Author: bilbobrovall

controllers/openstackmachine_controller.go

@@ -301,6 +301,10 @@ func (r *OpenStackMachineReconciler) reconcileDelete(scope scope.Scope, cluster
 // reconcileFloatingAddressFromPool creates IPAddressClaims for the OpenStackMachine if the OpenStackMachine has a
 // FloatingAddressFromPool specified. It then associates the IPAddressClaim with the instance.
 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 {
+		return nil
+	}
+
 	networkingService, err := networking.NewService(scope)
 	if err != nil {
 		return err
@@ -491,8 +495,9 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, scope
 
 	switch instanceStatus.State() {
 	case infrav1.InstanceStateActive:
-		if openStackMachine.Spec.FloatingAddressFromPool != nil && pointer.BoolDeref(openStackMachine.Status.FloatingAddressFromPoolReady, false) {
+		if openStackMachine.Spec.FloatingAddressFromPool == nil || pointer.BoolDeref(openStackMachine.Status.FloatingAddressFromPoolReady, false) {
 			scope.Logger().Info("Machine instance state is ACTIVE", "id", instanceStatus.ID())
+			openStackMachine.Status.Ready = true
 			conditions.MarkTrue(openStackMachine, infrav1.InstanceReadyCondition)
 		} else {
 			scope.Logger().Info("Machine instance state is ACTIVE, but floating IP is not ready yet", "id", instanceStatus.ID())