Fixed a test flake relating to nodeclaim/label creation.

Author: nathangeology

pkg/controllers/static/provisioning/suite_test.go

@@ -551,12 +551,26 @@ var _ = Describe("Static Provisioning Controller", func() {
 				Expect(<-errs).ToNot(HaveOccurred())
 			}
 
-			// we should never observe > limit NodeClaims.
+			// Wait for NodeClaims to be fully created and processed
+			// This gives time for cost tracking and other async operations to complete
+			Eventually(func() int {
+				var list v1.NodeClaimList
+				_ = env.Client.List(ctx, &list)
+				return len(list.Items)
+			}, 10*time.Second, 100*time.Millisecond).Should(BeNumerically("<=", 10))
+
+			// we should never observe > limit NodeClaims even after giving time for async operations
 			Consistently(func() int {
 				var list v1.NodeClaimList
 				_ = env.Client.List(ctx, &list)
 				return len(list.Items)
-			}, 5*time.Second).Should(BeNumerically("<=", 10))
+			}, 5*time.Second, 100*time.Millisecond).Should(BeNumerically("<=", 10))
+
+			// Wait for cluster state to be fully updated before checking counts
+			Eventually(func() bool {
+				running, _, _ := cluster.NodePoolState.GetNodeCount(nodePool.Name)
+				return running <= 10
+			}, 5*time.Second, 100*time.Millisecond).Should(BeTrue())
 
 			// at the end we should have right counts in StateNodePool
 			ExpectStateNodePoolCount(cluster, nodePool.Name, 10, 0, 0)

pkg/state/cost/cost.go

@@ -396,9 +396,37 @@ func nodeClaimMissingLabels(ctx context.Context, nc v1.NodeClaim) bool {
 		}
 	}
 	if len(missingLabels) > 0 {
-		log.FromContext(ctx).Error(serrors.Wrap(fmt.Errorf("nodeclaim is missing required labels"), "nodeclaim", klog.KObj(&nc), "missingLabels", missingLabels), "failed to update nodeclaim from cost tracking")
+		// For static NodeClaims, missing instance-specific labels during creation is expected
+		// as they are populated by the cloud provider after creation. Log at debug level
+		// instead of error to reduce noise in tests and CI.
+		if isStaticNodeClaim(&nc) {
+			log.FromContext(ctx).V(1).Info("static nodeclaim missing labels during initialization, will retry when labels are populated", "nodeclaim", klog.KObj(&nc), "missingLabels", missingLabels)
+		} else {
+			log.FromContext(ctx).Error(serrors.Wrap(fmt.Errorf("nodeclaim is missing required labels"), "nodeclaim", klog.KObj(&nc), "missingLabels", missingLabels), "failed to update nodeclaim from cost tracking")
+		}
 		return true
 	}
 
 	return false
 }
+
+// isStaticNodeClaim determines if a NodeClaim belongs to a static NodePool
+// by checking for the presence of static-specific annotations or owner references
+func isStaticNodeClaim(nc *v1.NodeClaim) bool {
+	// Static NodeClaims are created from NodePools with replicas set
+	// We can identify them by checking if they have the NodePool owner reference
+	// and the NodePool has static characteristics
+	for _, ownerRef := range nc.GetOwnerReferences() {
+		if ownerRef.Kind == "NodePool" {
+			// This is likely a static NodeClaim if it's owned by a NodePool
+			// Additional heuristic: static NodeClaims often lack instance-specific labels initially
+			_, hasInstanceType := nc.Labels[corev1.LabelInstanceTypeStable]
+			_, hasCapacityType := nc.Labels[v1.CapacityTypeLabelKey]
+			_, hasZone := nc.Labels[corev1.LabelTopologyZone]
+
+			// If it's missing these labels but has NodePool ownership, it's likely static
+			return !hasInstanceType || !hasCapacityType || !hasZone
+		}
+	}
+	return false
+}