Merge pull request #187 from mshitrit/last-error-fix

Last error not recorded for missing node
medik8s · Feb 5, 2024 · a264e8a · a264e8a
2 parents 796fef2 + 2e2fbbb
commit a264e8a
Showing 1 changed file with 5 additions and 5 deletions.
diff --git 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" {