From 953ded51c2cf0b0e1a491def8f70f158cd303bbd Mon Sep 17 00:00:00 2001 From: Michael Shitrit Date: Mon, 15 Jan 2024 09:30:12 +0200 Subject: [PATCH] ECOPROJECT-1829 Verify that Remediation started event isn't spammed Signed-off-by: Michael Shitrit --- controllers/selfnoderemediation_controller.go | 6 +++++- .../tests/controller/selfnoderemediation_controller_test.go | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/controllers/selfnoderemediation_controller.go b/controllers/selfnoderemediation_controller.go index 236c9ae0..8705f2f3 100644 --- a/controllers/selfnoderemediation_controller.go +++ b/controllers/selfnoderemediation_controller.go @@ -174,7 +174,11 @@ func (r *SelfNodeRemediationReconciler) Reconcile(ctx context.Context, req ctrl. r.logger.Error(err, "failed to get SNR") return ctrl.Result{}, err } - events.RemediationStarted(r.Recorder, snr) + + //used as an indication not to spam the event + if isFinalizerAlreadyAdded := controllerutil.ContainsFinalizer(snr, SNRFinalizer); !isFinalizerAlreadyAdded { + events.RemediationStarted(r.Recorder, snr) + } defer func() { if updateErr := r.updateSnrStatus(ctx, snr); updateErr != nil { diff --git a/controllers/tests/controller/selfnoderemediation_controller_test.go b/controllers/tests/controller/selfnoderemediation_controller_test.go index c64b7c75..dbd5d30d 100644 --- a/controllers/tests/controller/selfnoderemediation_controller_test.go +++ b/controllers/tests/controller/selfnoderemediation_controller_test.go @@ -173,7 +173,7 @@ var _ = Describe("SNR Controller", func() { It("Remediation flow", func() { node := verifyNodeIsUnschedulable() - verifyEvent("Normal", "RemediationCreated", "Remediation started") + verifyEvent("Normal", "RemediationStarted", "[remediation] Remediation started") verifyEvent("Normal", "MarkUnschedulable", "Remediation process - unhealthy node marked as unschedulable")