From 1b71d6643a55ec631c88786e1f69078cdf1a29a5 Mon Sep 17 00:00:00 2001
From: Hidekazu Nakamura <hidekazuna@gmail.com>
Date: Thu, 15 Jul 2021 10:27:37 +0900
Subject: [PATCH] Revert "reassociate Floating IP if first associate fails"

---
 controllers/openstackmachine_controller.go | 28 +---------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/controllers/openstackmachine_controller.go b/controllers/openstackmachine_controller.go
index afa91eba22..f63d00c1d7 100644
--- a/controllers/openstackmachine_controller.go
+++ b/controllers/openstackmachine_controller.go
@@ -30,7 +30,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/utils/pointer"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
@@ -54,7 +53,6 @@ import (
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/services/loadbalancer"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/services/networking"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/services/provider"
-	capoerrors "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors"
 )
 
 // OpenStackMachineReconciler reconciles a OpenStackMachine object.
@@ -355,31 +353,7 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, logger
 			handleUpdateMachineError(logger, openStackMachine, errors.Errorf("Floating IP cannot be got or created: %v", err))
 			return ctrl.Result{}, nil
 		}
-
-		// There is some possibility that floating IP is created but not able to be find right after that
-		// so give a retry here, see #927 for further information.
-		backoff := wait.Backoff{
-			Steps:    10,
-			Duration: time.Second,
-			Factor:   1.25,
-			Jitter:   0.1,
-		}
-		err = wait.ExponentialBackoff(backoff, func() (bool, error) {
-			if err := computeService.AssociateFloatingIP(instance.ID, fp.FloatingIP); err != nil {
-				if capoerrors.IsNotFound(err) {
-					// not found, timing issue
-					logger.Info("Floating IP association failed, will retry.", "instance-id", instance.ID, "floating-ip", fp.FloatingIP)
-					return false, nil
-				}
-				// real error occurs
-				return false, err
-			}
-			return true, nil
-		})
-		if err == wait.ErrWaitTimeout {
-			err = fmt.Errorf("floating IP association timeout %s", fp.FloatingIP)
-		}
-
+		err = computeService.AssociateFloatingIP(instance.ID, fp.FloatingIP)
 		if err != nil {
 			handleUpdateMachineError(logger, openStackMachine, errors.Errorf("Floating IP cannot be associated: %v", err))
 			return ctrl.Result{}, nil