Address comments

Author: Sedef

api/v1alpha3/condition_consts.go

@@ -126,7 +126,6 @@ const (
 )
 
 // Conditions and condition Reasons for the Machine's Node object
-
 const (
 	// MachineNodeHealthyCondition provides info about the operational state of the Kubernetes node hosted on the machine by summarizing  node conditions.
 	// If the conditions defined in a Kubernetes node (i.e., NodeReady, NodeMemoryPressure, NodeDiskPressure, NodePIDPressure, and NodeNetworkUnavailable) are in a healthy state, it will be set to True.
@@ -143,22 +142,3 @@ const (
 	// NodeConditionsFailedReason (Severity=Warning) documents a node is not in a healthy state due to the failed state of at least 1 Kubelet condition.
 	NodeConditionsFailedReason = "NodeConditionsFailed"
 )
-
-// Common Pod-related Condition Reasons used by Pod-related Conditions.
-const (
-	// PodProvisioningReason (Severity=Info) documents a pod waiting  to be provisioned i.e., Pod is in "Pending" phase and
-	// PodScheduled and Initialized conditions are not set to True yet.
-	PodProvisioningReason = "PodProvisioning"
-
-	// PodProvisioningReason (Severity=Warning) documents a pod failed during provisioning i.e., Pod is in "Pending" phase and
-	// PodScheduled and Initialized conditions are set to True,
-	// but ContainersReady or Ready condition is false (i.e., at least one of the containers are in waiting state(e.g CrashLoopbackOff, ImagePullBackOff)
-	PodProvisioningFailedReason = "PodProvisioningFailed"
-
-	// PodMissingReason (Severity=Warning) documents a pod does not exist.
-	PodMissingReason = "PodMissing"
-
-	// PodFailedReason (Severity=Error) documents a pod's at least one container has terminated in a failure
-	// and hence Pod is in "Failed" phase.
-	PodFailedReason = "PodFailed"
-)

controllers/machine_controller_noderef.go renamed to controllers/machine_controller_node.go

@@ -67,16 +67,12 @@ func (r *MachineReconciler) reconcileNode(ctx context.Context, cluster *clusterv
 			// If Status.NodeRef is not set before, node still can be in the provisioning state.
 			if machine.Status.NodeRef != nil {
 				conditions.MarkFalse(machine, clusterv1.MachineNodeHealthyCondition, clusterv1.NodeNotFoundReason, clusterv1.ConditionSeverityError, "")
-				return errors.Wrapf(&capierrors.RequeueAfterError{RequeueAfter: 20 * time.Second},
-					"failed to find the Node owned by Machine %q in namespace %q", machine.Name, machine.Namespace)
 			}
-
-			logger.Error(err, "Failed to assign NodeRef")
-			r.recorder.Event(machine, apicorev1.EventTypeWarning, "FailedSetNodeRef", err.Error())
 			return errors.Wrapf(&capierrors.RequeueAfterError{RequeueAfter: 20 * time.Second},
 				"cannot assign NodeRef to Machine %q in namespace %q, no matching Node", machine.Name, machine.Namespace)
 		}
-		// This may be a transient client error and may not mean there is no matching Node.
+		logger.Error(err, "Failed to assign NodeRef")
+		r.recorder.Event(machine, apicorev1.EventTypeWarning, "FailedSetNodeRef", err.Error())
 		return err
 	}
 
@@ -104,14 +100,21 @@ func (r *MachineReconciler) reconcileNode(ctx context.Context, cluster *clusterv
 	return nil
 }
 
-// Return true if all Node Conditions are false other than "Ready" condition.
-// "Ready" being false does not mean there is a problem with the Node, may be missing CNI.
+// checkNodeConditions checks if a Node is healthy and does not have any semantically negative Conditions.
+// Returns true if NodeMemoryPressure, NodeDiskPressure, or NodePIDPressure Conditions are false or Ready Condition is true.
 func checkNodeConditions(node *apicorev1.Node) bool {
 	for _, condition := range node.Status.Conditions {
-		if condition.Type != apicorev1.NodeReady {
-			if condition.Status == apicorev1.ConditionTrue {
-				return false
-			}
+		if condition.Type == apicorev1.NodeMemoryPressure && condition.Status == apicorev1.ConditionTrue {
+			return false
+		}
+		if condition.Type == apicorev1.NodeDiskPressure && condition.Status == apicorev1.ConditionTrue {
+			return false
+		}
+		if condition.Type == apicorev1.NodePIDPressure && condition.Status == apicorev1.ConditionTrue {
+			return false
+		}
+		if condition.Type == apicorev1.NodeReady && condition.Status == apicorev1.ConditionFalse {
+			return false
 		}
 	}
 	return true