From 0ebb8e3d22cb9da860c1aef32c5c40ae889db647 Mon Sep 17 00:00:00 2001 From: huiwq1990 Date: Thu, 10 Mar 2022 18:36:57 +0800 Subject: [PATCH] aggregate errors --- controllers/edgex_controller.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/controllers/edgex_controller.go b/controllers/edgex_controller.go index 764523a..e2377c7 100644 --- a/controllers/edgex_controller.go +++ b/controllers/edgex_controller.go @@ -29,6 +29,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" + kerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/utils/pointer" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" @@ -109,14 +110,12 @@ func (r *EdgeXReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ct ), ) - err := patchHelper.Patch(ctx, edgex) + if err := patchHelper.Patch(ctx, edgex); err != nil { + reterr = kerrors.NewAggregate([]error{reterr, err}) + } - // Patch the VSphereMachine resource. - if err != nil { - if reterr == nil { - reterr = err - } - logger.Error(err, "patch failed", "edgex", edgex.Namespace+"/"+edgex.Name) + if reterr != nil { + logger.Error(reterr, "reconcile failed", "edgex", edgex.Namespace+"/"+edgex.Name) } }()