From ec7c087ae1b8bfc47125f7b3e9bfb24b0855e2ad Mon Sep 17 00:00:00 2001 From: Nir Soffer Date: Mon, 21 Oct 2024 21:00:33 +0300 Subject: [PATCH] Simplify waitPlacementDecision It was returning both placement and placementDecsision name which is not helpful since we have a helper to return a placement. Signed-off-by: Nir Soffer --- e2e/dractions/actions.go | 2 +- e2e/dractions/retry.go | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/e2e/dractions/actions.go b/e2e/dractions/actions.go index c08677996..406fc819a 100644 --- a/e2e/dractions/actions.go +++ b/e2e/dractions/actions.go @@ -43,7 +43,7 @@ func EnableProtection(w workloads.Workload, d deployers.Deployer) error { placementName := name drpcName := name - placement, placementDecisionName, err := waitPlacementDecision(util.Ctx.Hub.CtrlClient, namespace, placementName) + placementDecisionName, err := waitPlacementDecision(util.Ctx.Hub.CtrlClient, namespace, placementName) if err != nil { return err } diff --git a/e2e/dractions/retry.go b/e2e/dractions/retry.go index 751b6c8ca..b85af0be0 100644 --- a/e2e/dractions/retry.go +++ b/e2e/dractions/retry.go @@ -16,23 +16,23 @@ import ( ) // nolint:gocognit -// return placement object, placementDecisionName, error +// return placementDecisionName, error func waitPlacementDecision(client client.Client, namespace string, placementName string, -) (*v1beta1.Placement, string, error) { +) (string, error) { startTime := time.Now() placementDecisionName := "" for { placement, err := getPlacement(client, namespace, placementName) if err != nil { - return nil, "", err + return "", err } for _, cond := range placement.Status.Conditions { if cond.Type == "PlacementSatisfied" && cond.Status == "True" { placementDecisionName = placement.Status.DecisionGroups[0].Decisions[0] if placementDecisionName != "" { - return placement, placementDecisionName, nil + return placementDecisionName, nil } } } @@ -41,11 +41,11 @@ func waitPlacementDecision(client client.Client, namespace string, placementName // so need query placementdecision by label placementDecision, err := getPlacementDecisionFromPlacement(client, placement) if err == nil && placementDecision != nil { - return placement, placementDecision.Name, nil + return placementDecision.Name, nil } if time.Since(startTime) > time.Second*time.Duration(util.Timeout) { - return nil, "", fmt.Errorf( + return "", fmt.Errorf( "could not get placement decision for " + placementName + " before timeout, fail") } @@ -136,7 +136,7 @@ func waitDRPCPhase(client client.Client, namespace, name string, phase ramen.DRS } func getCurrentCluster(client client.Client, namespace string, placementName string) (string, error) { - _, placementDecisionName, err := waitPlacementDecision(client, namespace, placementName) + placementDecisionName, err := waitPlacementDecision(client, namespace, placementName) if err != nil { return "", err }