Merge pull request #5534 from openshift-cherrypick-robot/cherry-pick-5532-to-release-4.18

openshift-merge-bot[bot] · web-flow · commit 0b0569287da3 · 2026-01-08T19:26:42.000Z
[release-4.18] OCPBUGS-71227: MCP is not correctly degraded when a pivotError happens
diff --git a/pkg/daemon/update.go b/pkg/daemon/update.go
@@ -822,7 +822,13 @@ func (dn *Daemon) updateOnClusterLayering(oldConfig, newConfig *mcfgv1.MachineCo
 	}
 
 	if dn.nodeWriter != nil {
-		state, err := getNodeAnnotationExt(dn.node, constants.MachineConfigDaemonStateAnnotationKey, true)
+		// Refetch node from lister to get fresh state before checking guard.
+		// This prevents overwriting Degraded/Unreconcilable states that were just set.
+		freshNode, err := dn.nodeLister.Get(dn.name)
+		if err != nil {
+			return fmt.Errorf("error fetching fresh node state: %w", err)
+		}
+		state, err := getNodeAnnotationExt(freshNode, constants.MachineConfigDaemonStateAnnotationKey, true)
 		if err != nil {
 			return err
 		}

Original file line number	Diff line number	Diff line change
`@@ -822,7 +822,13 @@ func (dn Daemon) updateOnClusterLayering(oldConfig, newConfig mcfgv1.MachineCo`
`822`	`822`	`}`
`823`	`823`
`824`	`824`	`if dn.nodeWriter != nil {`
`825`		`- state, err := getNodeAnnotationExt(dn.node, constants.MachineConfigDaemonStateAnnotationKey, true)`
	`825`	`+ // Refetch node from lister to get fresh state before checking guard.`
	`826`	`+ // This prevents overwriting Degraded/Unreconcilable states that were just set.`
	`827`	`+ freshNode, err := dn.nodeLister.Get(dn.name)`
	`828`	`+ if err != nil {`
	`829`	`+ return fmt.Errorf("error fetching fresh node state: %w", err)`
	`830`	`+ }`
	`831`	`+ state, err := getNodeAnnotationExt(freshNode, constants.MachineConfigDaemonStateAnnotationKey, true)`
`826`	`832`	`if err != nil {`
`827`	`833`	`return err`
`828`	`834`	`}`