From 5e6992d0338f15cfbd1f80ae1127f0c42361ed32 Mon Sep 17 00:00:00 2001 From: nayuta-ai Date: Sun, 26 Oct 2025 23:31:26 +0900 Subject: [PATCH 1/2] Add event for remediation in MachineHealthCheck Signed-off-by: nayuta-ai --- .../machinehealthcheck/machinehealthcheck_controller.go | 8 ++++++++ .../machinehealthcheck/machinehealthcheck_targets.go | 2 ++ 2 files changed, 10 insertions(+) diff --git a/internal/controllers/machinehealthcheck/machinehealthcheck_controller.go b/internal/controllers/machinehealthcheck/machinehealthcheck_controller.go index 0c21e5b69e7e..4f0995a1ea5e 100644 --- a/internal/controllers/machinehealthcheck/machinehealthcheck_controller.go +++ b/internal/controllers/machinehealthcheck/machinehealthcheck_controller.go @@ -539,6 +539,14 @@ func (r *Reconciler) patchUnhealthyTargets(ctx context.Context, logger logr.Logg klog.KObj(t.Machine), klog.KObj(t.MHC), ) + // Record event on MachineHealthCheck to track remediation history + r.recorder.Eventf( + m, + corev1.EventTypeNormal, + EventRemediationTriggered, + "Triggered remediation for unhealthy Machine %s", + klog.KObj(t.Machine), + ) } return errList } diff --git a/internal/controllers/machinehealthcheck/machinehealthcheck_targets.go b/internal/controllers/machinehealthcheck/machinehealthcheck_targets.go index fca4c786a072..de75686c8a06 100644 --- a/internal/controllers/machinehealthcheck/machinehealthcheck_targets.go +++ b/internal/controllers/machinehealthcheck/machinehealthcheck_targets.go @@ -45,6 +45,8 @@ const ( // EventMachineMarkedUnhealthy is emitted when machine was successfully marked as unhealthy. EventMachineMarkedUnhealthy string = "MachineMarkedUnhealthy" + // EventRemediationTriggered is emitted when MachineHealthCheck triggers remediation for an unhealthy machine. + EventRemediationTriggered string = "RemediationTriggered" ) var ( From 1bd07800b43de080cc88a441ecfbcd0fbb5e47d9 Mon Sep 17 00:00:00 2001 From: nayuta-ai Date: Mon, 3 Nov 2025 17:39:30 +0900 Subject: [PATCH 2/2] Improve MachineHealthCheck event messages Signed-off-by: nayuta-ai --- .../machinehealthcheck/machinehealthcheck_controller.go | 7 +++---- .../machinehealthcheck/machinehealthcheck_targets.go | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/internal/controllers/machinehealthcheck/machinehealthcheck_controller.go b/internal/controllers/machinehealthcheck/machinehealthcheck_controller.go index 4f0995a1ea5e..38ce9703391f 100644 --- a/internal/controllers/machinehealthcheck/machinehealthcheck_controller.go +++ b/internal/controllers/machinehealthcheck/machinehealthcheck_controller.go @@ -535,16 +535,15 @@ func (r *Reconciler) patchUnhealthyTargets(ctx context.Context, logger logr.Logg t.Machine, corev1.EventTypeNormal, EventMachineMarkedUnhealthy, - "Machine %s has been marked as unhealthy by %s", - klog.KObj(t.Machine), + "Marked as unhealthy by MachineHealthCheck %s", klog.KObj(t.MHC), ) // Record event on MachineHealthCheck to track remediation history r.recorder.Eventf( m, corev1.EventTypeNormal, - EventRemediationTriggered, - "Triggered remediation for unhealthy Machine %s", + EventMachineMarkedUnhealthy, + "Observed machine %s is now marked as unhealthy", klog.KObj(t.Machine), ) } diff --git a/internal/controllers/machinehealthcheck/machinehealthcheck_targets.go b/internal/controllers/machinehealthcheck/machinehealthcheck_targets.go index de75686c8a06..fca4c786a072 100644 --- a/internal/controllers/machinehealthcheck/machinehealthcheck_targets.go +++ b/internal/controllers/machinehealthcheck/machinehealthcheck_targets.go @@ -45,8 +45,6 @@ const ( // EventMachineMarkedUnhealthy is emitted when machine was successfully marked as unhealthy. EventMachineMarkedUnhealthy string = "MachineMarkedUnhealthy" - // EventRemediationTriggered is emitted when MachineHealthCheck triggers remediation for an unhealthy machine. - EventRemediationTriggered string = "RemediationTriggered" ) var (