Merge pull request #1569 from rzetelskik/job-sync-error-fix

Fix error aggregation in scyllacluster controller job sync
scylladb · Nov 14, 2023 · 04bf07f · 04bf07f
2 parents d7601ad + f674ffb
commit 04bf07f
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/pkg/controller/scyllacluster/sync_jobs.go b/pkg/controller/scyllacluster/sync_jobs.go
@@ -16,6 +16,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	apimeta "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 )
 
 func (scc *Controller) syncJobs(
@@ -86,6 +87,10 @@ func (scc *Controller) syncJobs(
 			})
 		}
 	}
+	err = utilerrors.NewAggregate(errs)
+	if err != nil {
+		return progressingConditions, err
+	}
 
 	return progressingConditions, nil
 }