Merge pull request #120 from clobrano/fix-double-handling-of-events-0

Fix events emitted twice
medik8s · Jan 30, 2024 · daf6d98 · daf6d98
2 parents 97b777f + 8211914
commit daf6d98
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/controllers/machinedeletionremediation_controller.go b/controllers/machinedeletionremediation_controller.go
@@ -133,10 +133,13 @@ func (r *MachineDeletionRemediationReconciler) Reconcile(ctx context.Context, re
 	}()
 
 	if r.isTimedOutByNHC(mdr) {
-		log.Info("NHC time out annotation found, stopping remediation")
-		commonevents.RemediationStoppedByNHC(r.Recorder, mdr)
-		_, err = r.updateConditions(remediationTimedOutByNhc, mdr)
-		return ctrl.Result{}, err
+		if updateRequired, err := r.updateConditions(remediationTimedOutByNhc, mdr); err != nil {
+			return ctrl.Result{}, err
+		} else if updateRequired {
+			log.Info("NHC time out annotation found, stopping remediation")
+			commonevents.RemediationStoppedByNHC(r.Recorder, mdr)
+		}
+		return ctrl.Result{}, nil
 	}
 
 	if updateRequired, err := r.updateConditions(remediationStarted, mdr); err != nil {
@@ -183,11 +186,12 @@ func (r *MachineDeletionRemediationReconciler) Reconcile(ctx context.Context, re
 			}
 			return ctrl.Result{}, err
 		} else if isRestored {
-			_, err = r.updateConditions(remediationFinishedMachineDeleted, mdr)
-			if err == nil {
+			if updateRequired, err := r.updateConditions(remediationFinishedMachineDeleted, mdr); err != nil {
+				return ctrl.Result{}, err
+			} else if updateRequired {
 				commonevents.RemediationFinished(r.Recorder, mdr)
 			}
-			return ctrl.Result{}, err
+			return ctrl.Result{}, nil
 		}
 		log.Info("waiting for the nodes count to be re-provisioned")
 		return ctrl.Result{RequeueAfter: 30 * time.Second}, nil