Don't return on error while waiting for stuff removal (kube-burner#264)

* Don't return on error while waiting for stuff removal Signed-off-by: Raul Sevilla <[email protected]> * Remove nsObjects field Signed-off-by: Raul Sevilla <[email protected]> --------- Signed-off-by: Raul Sevilla <[email protected]>
rsevilla87 · Mar 3, 2023 · b4f1307 · b4f1307
1 parent 7b62be9
commit b4f1307
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/pkg/burner/create.go b/pkg/burner/create.go
@@ -85,7 +85,7 @@ func setupCreateJob(jobConfig config.Job) Executor {
 		}
 		// If any of the objects is namespaced, we configure the job to create namepaces
 		if o.Namespaced {
-			ex.nsObjects = true
+			ex.Config.NamespacedIterations = true
 		}
 		log.Infof("Job %s: %d iterations with %d %s replicas", jobConfig.Name, jobConfig.JobIterations, obj.replicas, gvk.Kind)
 		ex.objects = append(ex.objects, obj)
@@ -106,7 +106,7 @@ func (ex *Executor) RunCreateJob(iterationStart, iterationEnd int) {
 	for label, value := range ex.Config.NamespaceLabels {
 		nsLabels[label] = value
 	}
-	if ex.nsObjects && !ex.Config.NamespacedIterations {
+	if !ex.Config.NamespacedIterations {
 		ns = ex.Config.Namespace
 		if err = createNamespace(ClientSet, ns, nsLabels); err != nil {
 			log.Fatal(err.Error())
@@ -115,7 +115,7 @@ func (ex *Executor) RunCreateJob(iterationStart, iterationEnd int) {
 	start := time.Now().Round(time.Second)
 	for i := iterationStart; i <= iterationEnd; i++ {
 		log.Debugf("Creating object replicas from iteration %d", i)
-		if ex.nsObjects && ex.Config.NamespacedIterations {
+		if ex.Config.NamespacedIterations {
 			ns = fmt.Sprintf("%s-%d", ex.Config.Namespace, i)
 			if err = createNamespace(ClientSet, fmt.Sprintf("%s-%d", ex.Config.Namespace, i), nsLabels); err != nil {
 				log.Error(err.Error())

diff --git a/pkg/burner/delete.go b/pkg/burner/delete.go
@@ -96,7 +96,8 @@ func (ex *Executor) RunDeleteJob() {
 			wait.PollImmediateInfinite(2*time.Second, func() (bool, error) {
 				itemList, err = dynamicClient.Resource(obj.gvr).List(context.TODO(), listOptions)
 				if err != nil {
-					return false, err
+					log.Error(err.Error())
+					return false, nil
 				}
 				if len(itemList.Items) > 0 {
 					log.Debugf("Waiting for %d %s labeled with %s to be deleted", len(itemList.Items), obj.gvr.Resource, labelSelector)

diff --git a/pkg/burner/job.go b/pkg/burner/job.go
@@ -52,14 +52,13 @@ type object struct {
 
 // Executor contains the information required to execute a job
 type Executor struct {
-	objects   []object
-	Start     time.Time
-	End       time.Time
-	Config    config.Job
-	selector  *util.Selector
-	uuid      string
-	limiter   *rate.Limiter
-	nsObjects bool
+	objects  []object
+	Start    time.Time
+	End      time.Time
+	Config   config.Job
+	selector *util.Selector
+	uuid     string
+	limiter  *rate.Limiter
 }
 
 const (