From 2e2fbbbe7ffb3a27ad50df15da46eceb20809f5e Mon Sep 17 00:00:00 2001 From: Michael Shitrit Date: Sun, 4 Feb 2024 13:41:06 +0200 Subject: [PATCH] fix bug, last error was shadowed by updateConditions result Signed-off-by: Michael Shitrit --- controllers/selfnoderemediation_controller.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/controllers/selfnoderemediation_controller.go b/controllers/selfnoderemediation_controller.go index fe3a6a34..8df0e6f2 100644 --- a/controllers/selfnoderemediation_controller.go +++ b/controllers/selfnoderemediation_controller.go @@ -216,14 +216,14 @@ func (r *SelfNodeRemediationReconciler) Reconcile(ctx context.Context, req ctrl. if err != nil { if apiErrors.IsNotFound(err) { r.logger.Info("couldn't find node matching remediation", "node name", snr.Name) - if err = r.updateConditions(remediationSkippedNodeNotFound, snr); err != nil { - return ctrl.Result{}, err + if updateErr := r.updateConditions(remediationSkippedNodeNotFound, snr); updateErr != nil { + return ctrl.Result{}, updateErr } events.NormalEvent(r.Recorder, snr, eventReasonRemediationStopped, "couldn't find node matching remediation") - return ctrl.Result{}, r.updateSnrStatusLastError(snr, err) + } else { + r.logger.Error(err, "failed to get node", "node name", snr.Name) } - r.logger.Error(err, "failed to get node", "node name", snr.Name) - return ctrl.Result{}, err + return ctrl.Result{}, r.updateSnrStatusLastError(snr, err) } if node.Labels[excludeRemediationLabel] == "true" {