Merge pull request oracle#315 in OKE/oci-cloud-controller-manager from task/OKE-21403-1.23 to release-1.23

* commit 'c63638e66acd90bb33c448b9c62703a241406853':
  Wait for LB to reach ACTIVE state before updating it

Author: AkarshES

pkg/cloudprovider/providers/oci/load_balancer.go

@@ -67,6 +67,7 @@ const (
 	lbConnectionIdleTimeoutTCP       = 300
 	lbConnectionIdleTimeoutHTTP      = 60
 	flexible                         = "flexible"
+	lbLifecycleStateActive           = "ACTIVE"
 	lbMaximumNetworkSecurityGroupIds = 5
 	excludeBackendFromLBLabel        = "node.kubernetes.io/exclude-from-external-load-balancers"
 )
@@ -492,6 +493,11 @@ func (cp *CloudProvider) EnsureLoadBalancer(ctx context.Context, clusterName str
 		return lbStatus, err
 	}
 
+	if lb.LifecycleState == nil || *lb.LifecycleState != lbLifecycleStateActive {
+		logger.With("lifecycleState", lb.LifecycleState).Infof("LB is not in %s state, will retry EnsureLoadBalancer", lbLifecycleStateActive)
+		return nil, errors.Errorf("rejecting request to update LB which is not in %s state", lbLifecycleStateActive)
+	}
+
 	// Existing load balancers cannot change subnets. This ensures that the spec matches
 	// what the actual load balancer has listed as the subnet ids. If the load balancer
 	// was just created then these values would be equal; however, if the load balancer
@@ -1075,6 +1081,9 @@ func loadBalancerToStatus(lb *client.GenericLoadBalancer) (*v1.LoadBalancerStatu
 		}
 		ingress = append(ingress, v1.LoadBalancerIngress{IP: *ip.IpAddress})
 	}
+	if len(ingress) == 0 {
+		return nil, errors.Errorf("ip addresses are not assigned for load balancer %q", *lb.DisplayName)
+	}
 	return &v1.LoadBalancerStatus{Ingress: ingress}, nil
 }
 

pkg/oci/client/load_balancer.go

@@ -388,13 +388,14 @@ func (c *loadbalancerClientStruct) AwaitWorkRequest(ctx context.Context, id stri
 	var wr *loadbalancer.WorkRequest
 	contextWithTimeout, cancel := context.WithTimeout(ctx, defaultSynchronousAPIContextTimeout)
 	defer cancel()
+	requestId, _ := generateRandUUID()
 	err := wait.PollUntil(workRequestPollInterval, func() (done bool, err error) {
 		twr, err := c.GetWorkRequest(contextWithTimeout, id)
 		if err != nil {
 			if IsRetryable(err) {
 				return false, nil
 			}
-			return true, errors.WithStack(err)
+			return true, errors.Wrapf(errors.WithStack(err), "failed to get workrequest. opc-request-id: %s", requestId)
 		}
 		switch twr.LifecycleState {
 		case loadbalancer.WorkRequestLifecycleStateSucceeded:

pkg/oci/client/utils.go

@@ -15,6 +15,8 @@
 package client
 
 import (
+	"crypto/rand"
+	"fmt"
 	"net/http"
 	"strings"
 
@@ -102,3 +104,15 @@ func NewRateLimiter(logger *zap.SugaredLogger, config *providercfg.RateLimiterCo
 
 	return rateLimiter
 }
+
+// source: oci-go-sdk common/http.go
+func generateRandUUID() (string, error) {
+	b := make([]byte, 16)
+	_, err := rand.Read(b)
+	if err != nil {
+		return "", err
+	}
+	uuid := fmt.Sprintf("%x%x%x%x%x", b[0:4], b[4:6], b[6:8], b[8:10], b[10:])
+
+	return uuid, nil
+}