Adds ipam scheme and fixes some comments from pr

Author: bilbobrovall

controllers/openstackmachine_controller.go

@@ -301,12 +301,6 @@ 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 {
-		conditions.MarkTrue(openStackMachine, infrav1.FloatingAddressFromPoolReadyCondition)
-		openStackMachine.Status.FloatingAddressFromPoolReady = pointer.BoolPtr(true)
-		return nil
-	}
-
 	networkingService, err := networking.NewService(scope)
 	if err != nil {
 		return err
@@ -362,7 +356,7 @@ func (r *OpenStackMachineReconciler) reconcileFloatingAddressFromPool(ctx contex
 		instanceAddresses := instanceNS.Addresses()
 		for _, instanceAddress := range instanceAddresses {
 			if instanceAddress.Address == address.Spec.Address {
-				openStackMachine.Status.FloatingAddressFromPoolReady = pointer.BoolPtr(true)
+				openStackMachine.Status.FloatingAddressFromPoolReady = pointer.Bool(true)
 				conditions.MarkTrue(openStackMachine, infrav1.FloatingAddressFromPoolReadyCondition)
 				return nil
 			}
@@ -391,18 +385,19 @@ func (r *OpenStackMachineReconciler) reconcileFloatingAddressFromPool(ctx contex
 				return err
 			}
 		}
-		openStackMachine.Status.FloatingAddressFromPoolReady = pointer.BoolPtr(true)
+		openStackMachine.Status.FloatingAddressFromPoolReady = pointer.Bool(true)
 		conditions.MarkTrue(openStackMachine, infrav1.FloatingAddressFromPoolReadyCondition)
 	} else {
 		scope.Logger().Info("Waiting for IPAddressClaim to be allocated", "name", claim.Name)
-		openStackMachine.Status.FloatingAddressFromPoolReady = pointer.BoolPtr(false)
+		openStackMachine.Status.FloatingAddressFromPoolReady = pointer.Bool(false)
 		conditions.MarkFalse(openStackMachine, infrav1.FloatingAddressFromPoolReadyCondition, infrav1.FloatingAddressFromPoolWaitingForIpamProviderReason, clusterv1.ConditionSeverityWarning, "")
 	}
 	return nil
 }
 
 func (r *OpenStackMachineReconciler) reconcileDeleteFloatingAddressFromPool(scope scope.Scope, openStackMachine *infrav1.OpenStackMachine) error {
-	scope.Logger().Info("Reconciling floating IP claims delete")
+	log := scope.Logger().WithValues("openStackMachine", openStackMachine.Name)
+	log.Info("Reconciling Machine delete floating address from pool")
 	if openStackMachine.Spec.FloatingAddressFromPool == nil {
 		return nil
 	}
@@ -496,7 +491,7 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, scope
 
 	switch instanceStatus.State() {
 	case infrav1.InstanceStateActive:
-		if 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())
 			conditions.MarkTrue(openStackMachine, infrav1.InstanceReadyCondition)
 		} else {

main.go

@@ -34,6 +34,7 @@ import (
 	_ "k8s.io/component-base/logs/json/register"
 	"k8s.io/klog/v2"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	ipamv1 "sigs.k8s.io/cluster-api/exp/ipam/api/v1alpha1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
@@ -78,6 +79,7 @@ var (
 func init() {
 	_ = clientgoscheme.AddToScheme(scheme)
 	_ = clusterv1.AddToScheme(scheme)
+	_ = ipamv1.AddToScheme(scheme)
 	_ = infrav1.AddToScheme(scheme)
 	_ = infrav1alpha5.AddToScheme(scheme)
 	_ = infrav1alpha6.AddToScheme(scheme)

pkg/utils/names/names.go

@@ -22,7 +22,7 @@ import (
 )
 
 const (
-	FloatingAddressIPClaimNameSuffix = "floating-address"
+	FloatingAddressIPClaimNameSuffix = "floating-ip-address"
 )
 
 func GetDescription(clusterName string) string {