HyperNode supports select Nodes By labels

Signed-off-by: wangbin <[email protected]>

Author: ecosysbin

docs/design/Network Topology Aware Scheduling.md

@@ -458,16 +458,20 @@ type MemberSpec struct {
 //	    regexMatch:
 //	      pattern: "^node-[0-9]+$"
 //
-// +kubebuilder:validation:XValidation:rule="self.exactMatch != null || self.regexMatch != null",message="Either ExactMatch or RegexMatch must be specified"
-// +kubebuilder:validation:XValidation:rule="!(self.exactMatch != null && self.regexMatch != null)",message="ExactMatch and RegexMatch cannot be specified together"
+// +kubebuilder:validation:XValidation:rule="has(self.exactMatch) || has(self.regexMatch) || has(self.LabelMatch)",message="Either ExactMatch or RegexMatch or LabelMatch must be specified"
+// +kubebuilder:validation:XValidation:rule="!(has(self.exactMatch) && has(self.regexMatch) && has(self.LabelMatch))",message="ExactMatch and RegexMatch and LabelMatch cannot be specified together"
 type MemberSelector struct {
-   // ExactMatch defines the exact match criteria (required when Type is "Exact").
+   // ExactMatch defines the exact match criteria.
    // +optional
    ExactMatch *ExactMatch `json:"exactMatch,omitempty"`
 
-   // RegexMatch defines the regex match criteria (required when Type is "Regex").
+   // RegexMatch defines the regex match criteria.
    // +optional
    RegexMatch *RegexMatch `json:"regexMatch,omitempty"`
+
+  // LabelMatch defines the labels match criteria (only take effect when Member Type is "Node").
+	// +optional
+	LabelMatch *metav1.LabelSelector `json:"labelMatch,omitempty"`
 }
 
 // ExactMatch represents the criteria for exact name matching.

go.mod

@@ -46,7 +46,7 @@ require (
 	sigs.k8s.io/controller-runtime v0.13.0
 	sigs.k8s.io/yaml v1.4.0
 	stathat.com/c/consistent v1.0.0
-	volcano.sh/apis v1.11.0-network-topology-preview.0
+	volcano.sh/apis v0.0.0-20250306023628-7264f8fe811c
 )
 
 require (

go.sum

@@ -510,5 +510,5 @@ sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
 stathat.com/c/consistent v1.0.0 h1:ezyc51EGcRPJUxfHGSgJjWzJdj3NiMU9pNfLNGiXV0c=
 stathat.com/c/consistent v1.0.0/go.mod h1:QkzMWzcbB+yQBL2AttO6sgsQS/JSTapcDISJalmCDS0=
-volcano.sh/apis v1.11.0-network-topology-preview.0 h1:lUdLoNxgXks/yD5Q5xAkKF4dojSPuuyg2YwxpiXRIVU=
-volcano.sh/apis v1.11.0-network-topology-preview.0/go.mod h1:FOdmG++9+8lgENJ9XXDh+O3Jcb9YVRnlMSpgIh3NSVI=
+volcano.sh/apis v0.0.0-20250306023628-7264f8fe811c h1:7asOFV/P5TV8kJaf7A/nHx7K2ZGrhQPdgye1V8aIWsk=
+volcano.sh/apis v0.0.0-20250306023628-7264f8fe811c/go.mod h1:FOdmG++9+8lgENJ9XXDh+O3Jcb9YVRnlMSpgIh3NSVI=

pkg/scheduler/api/hyper_node_info.go

@@ -447,6 +447,19 @@ func (hni *HyperNodesInfo) getMembers(selector topologyv1alpha1.MemberSelector,
 			}
 		}
 	}
+	if selector.LabelMatch != nil {
+		labelSelector, err := metav1.LabelSelectorAsSelector(selector.LabelMatch)
+		if err != nil {
+			klog.ErrorS(err, "Failed to construct labelSelector as labelMatch", "LabelMatch", selector.LabelMatch)
+			return sets.Set[string]{}
+		}
+		for _, node := range nodes {
+			nodeLabels := labels.Set(node.Labels)
+			if labelSelector.Matches(nodeLabels) {
+				members.Insert(node.Name)
+			}
+		}
+	}
 	return members
 }