From f674ffb0f87e560829dd89fc1f1dab6f1de95ac8 Mon Sep 17 00:00:00 2001 From: Kacper Rzetelski Date: Tue, 14 Nov 2023 17:39:59 +0100 Subject: [PATCH] Fix error aggregation in scyllacluster controller job sync --- pkg/controller/scyllacluster/sync_jobs.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/controller/scyllacluster/sync_jobs.go b/pkg/controller/scyllacluster/sync_jobs.go index 1e0c89f08f8..4c77c5ad76d 100644 --- 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 }