refactor: abstract node controller ready and schedulable code

Longhorn 7738

Signed-off-by: Eric Weber <[email protected]>

controller/node_controller.go

@@ -420,6 +420,8 @@ func (nc *NodeController) syncNode(key string) (err error) {
 		return err
 	}
 
+	node.Status.Region, node.Status.Zone = types.GetRegionAndZone(kubeNode.Labels)
+
 	if nc.controllerID != node.Name {
 		return nil
 	}
@@ -1862,17 +1864,29 @@ func isNodeOrDisksEvictionRequested(node *longhorn.Node) bool {
 
 func (nc *NodeController) setReadyAndSchedulableConditions(node *longhorn.Node, kubeNode *corev1.Node,
 	managerPods []*corev1.Pod) error {
-	nodeReady := true
-	defer func() {
-		// Only record true if we find no reason to record false.
-		if nodeReady {
-			node.Status.Conditions = types.SetConditionAndRecord(node.Status.Conditions,
-				longhorn.NodeConditionTypeReady, longhorn.ConditionStatusTrue,
-				"", fmt.Sprintf("Node %v is ready", node.Name),
-				nc.eventRecorder, node, corev1.EventTypeNormal)
-		}
-	}()
+	nodeReady := nc.setReadyConditionForManagerPod(node, managerPods)
+	nodeReady = nodeReady && nc.setReadyConditionForKubeNode(node, kubeNode)
+	if nodeReady {
+		// Only record true if we did not already record false.
+		node.Status.Conditions = types.SetConditionAndRecord(node.Status.Conditions,
+			longhorn.NodeConditionTypeReady, longhorn.ConditionStatusTrue,
+			"", fmt.Sprintf("Node %v is ready", node.Name),
+			nc.eventRecorder, node, corev1.EventTypeNormal)
+	}
+
+	disableSchedulingOnCordonedNode, err :=
+		nc.ds.GetSettingAsBool(types.SettingNameDisableSchedulingOnCordonedNode)
+	if err != nil {
+		return errors.Wrapf(err, "failed to get %v setting", types.SettingNameDisableSchedulingOnCordonedNode)
+	}
+	nc.SetSchedulableCondition(node, kubeNode, disableSchedulingOnCordonedNode)
 
+	return nil
+}
+
+func (nc *NodeController) setReadyConditionForManagerPod(node *longhorn.Node,
+	managerPods []*corev1.Pod) (nodeReady bool) {
+	nodeReady = true
 	nodeManagerFound := false
 	for _, pod := range managerPods {
 		if pod.Spec.NodeName == node.Name {
@@ -1885,7 +1899,7 @@ func (nc *NodeController) setReadyAndSchedulableConditions(node *longhorn.Node,
 						node.Status.Conditions = types.SetConditionAndRecord(node.Status.Conditions,
 							longhorn.NodeConditionTypeReady, longhorn.ConditionStatusFalse,
 							string(longhorn.NodeConditionReasonManagerPodDown),
-							fmt.Sprintf("Node %v is down: the manager pod %v is not running", node.Name, pod.Name),
+							fmt.Sprintf("Node %v is down: manager pod %v is not running", node.Name, pod.Name),
 							nc.eventRecorder, node, corev1.EventTypeWarning)
 					}
 					break
@@ -1899,10 +1913,14 @@ func (nc *NodeController) setReadyAndSchedulableConditions(node *longhorn.Node,
 		node.Status.Conditions = types.SetConditionAndRecord(node.Status.Conditions,
 			longhorn.NodeConditionTypeReady, longhorn.ConditionStatusFalse,
 			string(longhorn.NodeConditionReasonManagerPodMissing),
-			fmt.Sprintf("manager pod missing: node %v has no manager pod running on it", node.Name),
+			fmt.Sprintf("Manager pod is missing: node %v has no manager pod running on it", node.Name),
 			nc.eventRecorder, node, corev1.EventTypeWarning)
 	}
+	return // nodeReady is already correctly set.
+}
 
+func (nc *NodeController) setReadyConditionForKubeNode(node *longhorn.Node, kubeNode *corev1.Node) (nodeReady bool) {
+	nodeReady = true
 	kubeConditions := kubeNode.Status.Conditions
 	for _, con := range kubeConditions {
 		switch con.Type {
@@ -1937,18 +1955,14 @@ func (nc *NodeController) setReadyAndSchedulableConditions(node *longhorn.Node,
 			}
 		}
 	}
+	return // nodeReady is already correctly set.
+}
 
-	DisableSchedulingOnCordonedNode, err :=
-		nc.ds.GetSettingAsBool(types.SettingNameDisableSchedulingOnCordonedNode)
-	if err != nil {
-		return errors.Wrapf(err, "failed to get %v setting", types.SettingNameDisableSchedulingOnCordonedNode)
-	}
-
-	// Update node condition based on
-	// DisableSchedulingOnCordonedNode setting and
-	// k8s node status
+// Update node condition based on DisableSchedulingOnCordonedNode setting and Kubernetes node status.
+func (nc *NodeController) SetSchedulableCondition(node *longhorn.Node, kubeNode *corev1.Node,
+	disableSchedulingOnCordonedNode bool) {
 	kubeSpec := kubeNode.Spec
-	if DisableSchedulingOnCordonedNode &&
+	if disableSchedulingOnCordonedNode &&
 		kubeSpec.Unschedulable {
 		node.Status.Conditions =
 			types.SetConditionAndRecord(node.Status.Conditions,
@@ -1968,8 +1982,4 @@ func (nc *NodeController) setReadyAndSchedulableConditions(node *longhorn.Node,
 				nc.eventRecorder, node,
 				corev1.EventTypeNormal)
 	}
-
-	node.Status.Region, node.Status.Zone = types.GetRegionAndZone(kubeNode.Labels)
-
-	return nil
 }