refactor: report actual observed status in CRD status field currentStatus and add defaultStatus field in CRD status

Signed-off-by: Anurag Pathak <contact@anuragthepathak.com>

Author: AnuragThePathak

api/v1alpha1/nodereadinessrule_types.go

@@ -267,6 +267,14 @@ type ConditionEvaluationResult struct {
 	// +required
 	// +kubebuilder:validation:Enum=True;False;Unknown
 	RequiredStatus corev1.ConditionStatus `json:"requiredStatus,omitempty"`
+
+	// defaultStatus is the status a condition is evaluated to if the condition
+	// is not found in a node. Reflects the defaultStatus configured in the rule
+	// spec.
+	//
+	// +optional
+	// +kubebuilder:validation:Enum=True;False;Unknown
+	DefaultStatus corev1.ConditionStatus `json:"defaultStatus,omitempty"`
 }
 
 // DryRunResults provides a summary of the actions the controller would perform if DryRun mode is enabled.

config/crd/bases/readiness.node.x-k8s.io_nodereadinessrules.yaml

@@ -377,6 +377,16 @@ spec:
                             - "False"
                             - Unknown
                             type: string
+                          defaultStatus:
+                            description: |-
+                              defaultStatus is the status a condition is evaluated to if the condition
+                              is not found in a node. Reflects the defaultStatus configured in the rule
+                              spec.
+                            enum:
+                            - "True"
+                            - "False"
+                            - Unknown
+                            type: string
                           requiredStatus:
                             description: requiredStatus is the status value defined
                               in the rule that must be matched, one of True, False,

internal/controller/nodereadinessrule_controller.go

@@ -298,21 +298,33 @@ func (r *RuleReadinessController) evaluateRuleForNode(ctx context.Context, rule
 	conditionResults := make([]readinessv1alpha1.ConditionEvaluationResult, 0, len(rule.Spec.Conditions))
 
 	for _, condReq := range rule.Spec.Conditions {
-		currentStatus, _ := r.getConditionStatus(node, condReq.Type, condReq.GetDefaultStatus())
-		satisfied := currentStatus == condReq.RequiredStatus
+		effectiveStatus, conditionFound := r.getConditionStatus(
+			node,
+			condReq.Type,
+			condReq.GetDefaultStatus(),
+		)
+		satisfied := effectiveStatus == condReq.RequiredStatus
+
+		// observedStatus is the condition status of a node without applying the default
+		// fallback in case the condition is not found.
+		observedStatus := effectiveStatus
+		if !conditionFound {
+			observedStatus = corev1.ConditionUnknown
+		}
 
 		if !satisfied {
 			allConditionsSatisfied = false
 		}
 
 		conditionResults = append(conditionResults, readinessv1alpha1.ConditionEvaluationResult{
 			Type:           condReq.Type,
-			CurrentStatus:  currentStatus,
+			CurrentStatus:  observedStatus,
 			RequiredStatus: condReq.RequiredStatus,
+			DefaultStatus:  condReq.GetDefaultStatus(),
 		})
 
 		log.V(1).Info("Condition evaluation", "node", node.Name, "rule", rule.Name,
-			"conditionType", condReq.Type, "current", currentStatus, "required", condReq.RequiredStatus,
+			"conditionType", condReq.Type, "current", observedStatus, "required", condReq.RequiredStatus,
 			"satisfied", satisfied)
 	}