Merge pull request #5492 from dkhater-redhat/pivotError-no-degredation

openshift-merge-bot[bot] · web-flow · commit ae23a39a21dd · 2025-12-15T21:45:15.000Z
OCPBUGS-62984: MCP is not correctly degraded when a pivotError happens
diff --git a/pkg/daemon/update.go b/pkg/daemon/update.go
@@ -926,7 +926,13 @@ func (dn *Daemon) update(oldConfig, newConfig *mcfgv1.MachineConfig, skipCertifi
 	}
 
 	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
`@@ -926,7 +926,13 @@ func (dn Daemon) update(oldConfig, newConfig mcfgv1.MachineConfig, skipCertifi`
`926`	`926`	`}`
`927`	`927`
`928`	`928`	`if dn.nodeWriter != nil {`
`929`		`- state, err := getNodeAnnotationExt(dn.node, constants.MachineConfigDaemonStateAnnotationKey, true)`
	`929`	`+ // Refetch node from lister to get fresh state before checking guard.`
	`930`	`+ // This prevents overwriting Degraded/Unreconcilable states that were just set.`
	`931`	`+ freshNode, err := dn.nodeLister.Get(dn.name)`
	`932`	`+ if err != nil {`
	`933`	`+ return fmt.Errorf("error fetching fresh node state: %w", err)`
	`934`	`+ }`
	`935`	`+ state, err := getNodeAnnotationExt(freshNode, constants.MachineConfigDaemonStateAnnotationKey, true)`
`930`	`936`	`if err != nil {`
`931`	`937`	`return err`
`932`	`938`	`}`