Changed wrClient to nlb and lb client to fetch core work-requests. (#384)

Author: sindhusri16

cloud/ociutil/ociutil.go

@@ -24,13 +24,11 @@ import (
 
 	lb "github.com/oracle/cluster-api-provider-oci/cloud/services/loadbalancer"
 	nlb "github.com/oracle/cluster-api-provider-oci/cloud/services/networkloadbalancer"
-	wrs "github.com/oracle/cluster-api-provider-oci/cloud/services/workrequests"
 
 	"github.com/oracle/oci-go-sdk/v65/common"
 	"github.com/oracle/oci-go-sdk/v65/core"
 	"github.com/oracle/oci-go-sdk/v65/loadbalancer"
 	"github.com/oracle/oci-go-sdk/v65/networkloadbalancer"
-	"github.com/oracle/oci-go-sdk/v65/workrequests"
 
 	"github.com/pkg/errors"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -63,22 +61,8 @@ func IsNotFound(err error) bool {
 	return ok && serviceErr.GetHTTPStatusCode() == http.StatusNotFound
 }
 
-func FetchErrorsOnFailedWorkRequest(ctx context.Context, workRequestClient wrs.Client, workRequestId *string) (done bool, err error) {
-	resp, err := workRequestClient.ListWorkRequestErrors(ctx, workrequests.ListWorkRequestErrorsRequest{
-		WorkRequestId: workRequestId,
-	})
-	if err != nil {
-		return false, errors.Wrapf(err, "Failed to fetch work-request-errors for failed workrequest: %s", *workRequestId)
-	}
-	final_err := errors.Errorf("WorkRequest %s failed", *workRequestId)
-	for _, wr_err := range resp.Items {
-		final_err = errors.Errorf("%s, %s", *wr_err.Message, final_err.Error())
-	}
-	return false, final_err
-}
-
 // AwaitNLBWorkRequest waits for the LB work request to either succeed, fail. See k8s.io/apimachinery/pkg/util/wait
-func AwaitNLBWorkRequest(ctx context.Context, networkLoadBalancerClient nlb.NetworkLoadBalancerClient, workRequestClient wrs.Client, workRequestId *string) (*networkloadbalancer.WorkRequest, error) {
+func AwaitNLBWorkRequest(ctx context.Context, networkLoadBalancerClient nlb.NetworkLoadBalancerClient, workRequestId *string) (*networkloadbalancer.WorkRequest, error) {
 	var wr *networkloadbalancer.WorkRequest
 	immediate := true
 	err := wait.PollUntilContextTimeout(ctx, WorkRequestPollInterval, WorkRequestTimeout, immediate, func(ctx context.Context) (done bool, err error) {
@@ -93,15 +77,27 @@ func AwaitNLBWorkRequest(ctx context.Context, networkLoadBalancerClient nlb.Netw
 			wr = &twr.WorkRequest
 			return true, nil
 		case networkloadbalancer.OperationStatusFailed:
-			return FetchErrorsOnFailedWorkRequest(ctx, workRequestClient, workRequestId)
+			wreq := networkloadbalancer.ListWorkRequestErrorsRequest{
+				WorkRequestId: workRequestId,
+				CompartmentId: twr.CompartmentId,
+			}
+			final_err := errors.Errorf("WorkRequest %s failed", *workRequestId)
+			wresp, err := networkLoadBalancerClient.ListWorkRequestErrors(ctx, wreq)
+			if err != nil {
+				return false, errors.Wrap(final_err, "Failed to fetch the work-request-errors using nlb client")
+			}
+			for _, wr_err := range wresp.WorkRequestErrorCollection.Items {
+				final_err = errors.Wrapf(final_err, "%s: %s", *wr_err.Code, *wr_err.Message)
+			}
+			return false, final_err
 		}
 		return false, nil
 	})
 	return wr, err
 }
 
 // AwaitLBWorkRequest waits for the LBaaS work request to either succeed, fail. See k8s.io/apimachinery/pkg/util/wait
-func AwaitLBWorkRequest(ctx context.Context, loadBalancerClient lb.LoadBalancerClient, workRequestClient wrs.Client, workRequestId *string) (*loadbalancer.WorkRequest, error) {
+func AwaitLBWorkRequest(ctx context.Context, loadBalancerClient lb.LoadBalancerClient, workRequestId *string) (*loadbalancer.WorkRequest, error) {
 	var wr *loadbalancer.WorkRequest
 	immediate := true
 	err := wait.PollUntilContextTimeout(ctx, WorkRequestPollInterval, WorkRequestTimeout, immediate, func(ctx context.Context) (done bool, err error) {
@@ -116,7 +112,11 @@ func AwaitLBWorkRequest(ctx context.Context, loadBalancerClient lb.LoadBalancerC
 			wr = &twr.WorkRequest
 			return true, nil
 		case loadbalancer.WorkRequestLifecycleStateFailed:
-			return FetchErrorsOnFailedWorkRequest(ctx, workRequestClient, workRequestId)
+			final_err := errors.Errorf("WorkRequest %s failed", *workRequestId)
+			for _, wreq := range twr.WorkRequest.ErrorDetails {
+				final_err = errors.Wrapf(final_err, "%s: %s", wreq.ErrorCode, *wreq.Message)
+			}
+			return false, final_err
 		}
 		return false, nil
 	})

cloud/scope/cluster.go

@@ -29,7 +29,6 @@ import (
 	lb "github.com/oracle/cluster-api-provider-oci/cloud/services/loadbalancer"
 	nlb "github.com/oracle/cluster-api-provider-oci/cloud/services/networkloadbalancer"
 	"github.com/oracle/cluster-api-provider-oci/cloud/services/vcn"
-	wr "github.com/oracle/cluster-api-provider-oci/cloud/services/workrequests"
 	"github.com/oracle/oci-go-sdk/v65/common"
 	"github.com/oracle/oci-go-sdk/v65/identity"
 	"github.com/pkg/errors"
@@ -56,7 +55,6 @@ type ClusterScopeParams struct {
 	NetworkLoadBalancerClient nlb.NetworkLoadBalancerClient
 	LoadBalancerClient        lb.LoadBalancerClient
 	IdentityClient            identityClient.Client
-	WorkRequestClient         wr.Client
 	// RegionIdentifier Identifier as specified here https://docs.oracle.com/en-us/iaas/Content/General/Concepts/regions.htm
 	RegionIdentifier      string
 	OCIAuthConfigProvider common.ConfigurationProvider
@@ -75,7 +73,6 @@ type ClusterScope struct {
 	NetworkLoadBalancerClient nlb.NetworkLoadBalancerClient
 	LoadBalancerClient        lb.LoadBalancerClient
 	IdentityClient            identityClient.Client
-	WorkRequestClient         wr.Client
 	// RegionIdentifier Identifier as specified here https://docs.oracle.com/en-us/iaas/Content/General/Concepts/regions.htm
 	RegionIdentifier   string
 	ClientProvider     *ClientProvider
@@ -107,7 +104,6 @@ func NewClusterScope(params ClusterScopeParams) (*ClusterScope, error) {
 		NetworkLoadBalancerClient: params.NetworkLoadBalancerClient,
 		LoadBalancerClient:        params.LoadBalancerClient,
 		IdentityClient:            params.IdentityClient,
-		WorkRequestClient:         params.WorkRequestClient,
 		RegionIdentifier:          params.RegionIdentifier,
 		ClientProvider:            params.ClientProvider,
 		OCIClusterAccessor:        params.OCIClusterAccessor,

cloud/scope/load_balancer_reconciler.go

@@ -88,7 +88,7 @@ func (s *ClusterScope) DeleteApiServerLB(ctx context.Context) error {
 		s.Logger.Error(err, "failed to delete apiserver lb")
 		return errors.Wrap(err, "failed to delete apiserver lb")
 	}
-	_, err = ociutil.AwaitLBWorkRequest(ctx, s.LoadBalancerClient, s.WorkRequestClient, lbResponse.OpcWorkRequestId)
+	_, err = ociutil.AwaitLBWorkRequest(ctx, s.LoadBalancerClient, lbResponse.OpcWorkRequestId)
 	if err != nil {
 		return errors.Wrap(err, "work request to delete lb failed")
 	}
@@ -129,7 +129,7 @@ func (s *ClusterScope) UpdateLB(ctx context.Context, lb infrastructurev1beta2.Lo
 		s.Logger.Error(err, "failed to reconcile the apiserver LB, failed to generate update lb workrequest")
 		return errors.Wrap(err, "failed to reconcile the apiserver LB, failed to generate update lb workrequest")
 	}
-	_, err = ociutil.AwaitLBWorkRequest(ctx, s.LoadBalancerClient, s.WorkRequestClient, lbResponse.OpcWorkRequestId)
+	_, err = ociutil.AwaitLBWorkRequest(ctx, s.LoadBalancerClient, lbResponse.OpcWorkRequestId)
 	if err != nil {
 		s.Logger.Error(err, "failed to reconcile the apiserver LB, failed to update lb")
 		return errors.Wrap(err, "failed to reconcile the apiserver LB, failed to update lb")
@@ -202,7 +202,7 @@ func (s *ClusterScope) CreateLB(ctx context.Context, lb infrastructurev1beta2.Lo
 		return nil, nil, errors.Wrap(err, "failed to create apiserver lb, failed to create work request")
 	}
 
-	wr, err := ociutil.AwaitLBWorkRequest(ctx, s.LoadBalancerClient, s.WorkRequestClient, lbResponse.OpcWorkRequestId)
+	wr, err := ociutil.AwaitLBWorkRequest(ctx, s.LoadBalancerClient, lbResponse.OpcWorkRequestId)
 	if err != nil {
 		return nil, nil, errors.Wrap(err, "awaiting load balancer")
 	}