daemon: update 'SetDegrade' flow to include updating the degrade condition in the MCN

Author: isabella-janssen

pkg/apihelpers/apihelpers.go

@@ -501,3 +501,34 @@ func GetManagedBootImagesWithUpdateDisabled() opv1.ManagedBootImages {
 func GetManagedBootImagesWithNoConfiguration() opv1.ManagedBootImages {
 	return opv1.ManagedBootImages{}
 }
+
+// // GetMachineConfigNodeCondition returns the condition with the provided type.
+// func GetMachineConfigNodeCondition(status mcfgv1.MachineConfigPoolStatus, condType mcfgv1.MachineConfigPoolConditionType) *mcfgv1.MachineConfigPoolCondition {
+// 	// in case of sync errors, return the last condition that matches, not the first
+// 	// this exists for redundancy and potential race conditions.
+// 	var LatestState *mcfgv1.MachineConfigPoolCondition
+// 	for i := range status.Conditions {
+// 		c := status.Conditions[i]
+// 		if c.Type == condType {
+// 			LatestState = &c
+// 		}
+// 	}
+// 	return LatestState
+// }
+
+// // SetMachineConfigNodeCondition updates the MachineConfigNode to include the provided condition. If the condition that
+// // we are about to add already exists and has the same status and reason, then we are not going to update.
+// func SetMachineConfigNodeCondition(status *mcfgv1.MachineConfigPoolStatus, condition mcfgv1.MachineConfigPoolCondition) {
+// 	currentCond := GetMachineConfigPoolCondition(*status, condition.Type)
+// 	if currentCond != nil && currentCond.Status == condition.Status && currentCond.Reason == condition.Reason && currentCond.Message == condition.Message {
+// 		return
+// 	}
+// 	// Do not update lastTransitionTime if the status of the condition doesn't change.
+// 	if currentCond != nil && currentCond.Status == condition.Status {
+// 		condition.LastTransitionTime = currentCond.LastTransitionTime
+// 	}
+// 	newConditions := filterOutMachineConfigPoolCondition(status.Conditions, condition.Type)
+// 	newConditions = append(newConditions, condition)
+// 	status.Conditions = newConditions
+
+// }

pkg/daemon/daemon.go

@@ -649,15 +649,33 @@ type unreconcilableErr struct {
 	error
 }
 
+// updateErrorState calls `SetUnreconcilable` to set the node's state annotation value to
+// "Unreconcilable" and the associated reason annotation if the provided error is an unreconcilable
+// error. Otherwise it calls `updateDegradedState` to set the node's state annotation value to
+// "Degraded," populate the associated reason annotation, and set the degrade condition in the MCN.
 func (dn *Daemon) updateErrorState(err error) error {
 	var uErr *unreconcilableErr
 	if errors.As(err, &uErr) {
-		dn.nodeWriter.SetUnreconcilable(err)
+		return dn.nodeWriter.SetUnreconcilable(err)
 	} else {
-		if err := dn.nodeWriter.SetDegraded(err); err != nil {
-			return err
-		}
+		return dn.updateDegradedState(err)
+	}
+}
+
+// `updateDegradedState` calls `SetDegraded` to set the node's state annotation value to "Degraded"
+// and populate the associated reason annotation. It then sets the degrade condition in the MCN.
+func (dn *Daemon) updateDegradedState(err error) error {
+	// Set node state annotation to "Degraded"
+	if setErr := dn.nodeWriter.SetDegraded(err); setErr != nil {
+		return setErr
+	}
+	// Get MCP associated with node
+	pool, poolErr := helpers.GetPrimaryPoolNameForMCN(dn.mcpLister, dn.node)
+	if poolErr != nil {
+		return poolErr
 	}
+	// Set the node's MCN condition to "Degraded"
+	dn.reportMachineNodeDegradeStatus(err, pool)
 	return nil
 }
 
@@ -2419,7 +2437,7 @@ func (dn *Daemon) runOnceFromMachineConfig(machineConfig mcfgv1.MachineConfig, c
 		// NOTE: This case expects a cluster to exists already.
 		ufc, err := dn.prepUpdateFromCluster()
 		if err != nil {
-			if err := dn.nodeWriter.SetDegraded(err); err != nil {
+			if err := dn.updateDegradedState(err); err != nil {
 				return err
 			}
 			return err
@@ -2429,7 +2447,7 @@ func (dn *Daemon) runOnceFromMachineConfig(machineConfig mcfgv1.MachineConfig, c
 		}
 		// At this point we have verified we need to update
 		if err = dn.triggerUpdateWithMachineConfig(ufc.currentConfig, &machineConfig, false); err != nil {
-			dn.nodeWriter.SetDegraded(err)
+			dn.updateDegradedState(err)
 			return err
 		}
 		return nil