remove parallel execution

Author: fabriziopandini

cmd/clusterctl/pkg/client/cluster/mover.go

@@ -18,7 +18,6 @@ package cluster
 
 import (
 	"fmt"
-	"sync"
 	"time"
 
 	"github.com/go-logr/logr"
@@ -237,36 +236,20 @@ const (
 
 // createGroup creates all the Kubernetes objects into the target management cluster corresponding to the object graph nodes in a moveGroup.
 func (o *objectMover) createGroup(group moveGroup, toProxy Proxy) error {
-
-	// Creates - in parallel - all the nodes in the group.
-	var wg sync.WaitGroup
 	errList := []error{}
-	errCh := make(chan error)
-	defer close(errCh)
-
-	go func() {
-		for e := range errCh {
-			errList = append(errList, e)
+	for i := range group {
+		nodeToCreate := group[i]
+
+		// Creates the Kubernetes object corresponding to the nodeToCreate.
+		// Nb. The operation is wrapped in a retry loop to make move more resilient to unexpected conditions.
+		err := retry(retryCreateTargetObject, retryIntervalCreateTargetObject, o.log, func() error {
+			return o.createTargetObject(nodeToCreate, toProxy)
+		})
+		if err != nil {
+			errList = append(errList, err)
 		}
-	}()
-
-	for _, nodeToCreate := range group {
-		wg.Add(1)
-		go func(node *node) {
-			defer wg.Done()
-
-			// Creates the Kubernetes object corresponding to the nodeToCreate.
-			// Nb. The operation is wrapped in a retry loop to make move more resilient to unexpected conditions.
-			err := retry(retryCreateTargetObject, retryIntervalCreateTargetObject, o.log, func() error {
-				return o.createTargetObject(node, toProxy)
-			})
-			if err != nil {
-				errCh <- err
-			}
-		}(nodeToCreate)
 	}
 
-	wg.Wait()
 	if len(errList) > 0 {
 		return kerrors.NewAggregate(errList)
 	}
@@ -372,37 +355,21 @@ const (
 
 // deleteGroup deletes all the Kubernetes objects from the source management cluster corresponding to the object graph nodes in a moveGroup.
 func (o *objectMover) deleteGroup(group moveGroup) error {
-	// Deletes - in parallel - the dependents nodes and the softDependents nodes (with the respective object tree).
-	var wg sync.WaitGroup
 	errList := []error{}
-	errCh := make(chan error)
-	defer close(errCh)
-
-	go func() {
-		for e := range errCh {
-			errList = append(errList, e)
-		}
-	}()
+	for i := range group {
+		nodeToDelete := group[i]
 
-	for _, nodeToDelete := range group {
-		wg.Add(1)
-		go func(node *node) {
-			defer wg.Done()
+		// Delete the Kubernetes object corresponding to the current node.
+		// Nb. The operation is wrapped in a retry loop to make move more resilient to unexpected conditions.
+		err := retry(retryDeleteSourceObject, retryIntervalDeleteSourceObject, o.log, func() error {
+			return o.deleteSourceObject(nodeToDelete)
+		})
 
-			// Delete the Kubernetes object corresponding to the current node.
-			// Nb. The operation is wrapped in a retry loop to make move more resilient to unexpected conditions.
-			err := retry(retryDeleteSourceObject, retryIntervalDeleteSourceObject, o.log, func() error {
-				return o.deleteSourceObject(node)
-			})
-
-			if err != nil {
-				errCh <- err
-			}
-
-		}(nodeToDelete)
+		if err != nil {
+			errList = append(errList, err)
+		}
 	}
 
-	wg.Wait()
 	return kerrors.NewAggregate(errList)
 }