Merge pull request #30188 from dgoodwin/fix-node-notready-when-deleted

openshift-merge-bot[bot] · web-flow · commit 2af38a780769 · 2025-09-05T14:29:29.000Z
NO-JIRA: Fix Node NotReady intervals being left open when a node is deleted
diff --git a/pkg/monitor/monitorapi/types.go b/pkg/monitor/monitorapi/types.go
@@ -223,6 +223,7 @@ const (
 	NodeFailedLeaseBackoff IntervalReason = "FailedToUpdateLeaseInBackoff"
 	NodeDiskPressure       IntervalReason = "NodeDiskPressure"
 	NodeNoDiskPressure     IntervalReason = "NodeNoDiskPressure"
+	NodeDeleted            IntervalReason = "Deleted"
 
 	MachineConfigChangeReason  IntervalReason = "MachineConfigChange"
 	MachineConfigReachedReason IntervalReason = "MachineConfigReached"
diff --git a/pkg/monitortests/node/nodestateanalyzer/node.go b/pkg/monitortests/node/nodestateanalyzer/node.go
@@ -61,7 +61,7 @@ func intervalsFromEvents_NodeChanges(events monitorapi.Intervals, _ monitorapi.R
 			if event.Source == monitorapi.SourceNodeMonitor {
 				nodeStateTracker.OpenInterval(nodeLocator, notReadyState, event.From)
 			}
-		case "Ready":
+		case "Ready", monitorapi.NodeDeleted:
 			if event.Source == monitorapi.SourceNodeMonitor {
 				mb := monitorapi.NewMessage().Reason(monitorapi.NodeNotReadyReason).
 					HumanMessage("node is not ready").
diff --git a/pkg/monitortests/node/watchnodes/node.go b/pkg/monitortests/node/watchnodes/node.go
@@ -278,6 +278,7 @@ func startNodeMonitoring(ctx context.Context, m monitorapi.RecorderWriter, clien
 						WithAnnotations(map[monitorapi.AnnotationKey]string{
 							monitorapi.AnnotationRoles: nodeRoles(node),
 						}).
+						Reason(monitorapi.NodeDeleted).
 						HumanMessage("deleted")).
 					Build(now, now)
 				m.AddIntervals(i)

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ func intervalsFromEvents_NodeChanges(events monitorapi.Intervals, _ monitorapi.R`
`61`	`61`	`if event.Source == monitorapi.SourceNodeMonitor {`
`62`	`62`	`nodeStateTracker.OpenInterval(nodeLocator, notReadyState, event.From)`
`63`	`63`	`}`
`64`		`- case "Ready":`
	`64`	`+ case "Ready", monitorapi.NodeDeleted:`
`65`	`65`	`if event.Source == monitorapi.SourceNodeMonitor {`
`66`	`66`	`mb := monitorapi.NewMessage().Reason(monitorapi.NodeNotReadyReason).`
`67`	`67`	`HumanMessage("node is not ready").`