Automated cherry pick of #4473: fix node count reconcile

installer/helm/chart/volcano/templates/controllers.yaml

@@ -88,6 +88,9 @@ rules:
   - apiGroups: ["topology.volcano.sh"]
     resources: ["hypernodes", "hypernodes/status"]
     verbs: ["list", "watch", "get", "create", "delete", "update", "patch"]
+  - apiGroups: [ "" ]
+    resources: [ "nodes" ]
+    verbs: [ "list", "watch" ]
 ---
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1

installer/volcano-development.yaml

@@ -4485,6 +4485,9 @@ rules:
   - apiGroups: ["topology.volcano.sh"]
     resources: ["hypernodes", "hypernodes/status"]
     verbs: ["list", "watch", "get", "create", "delete", "update", "patch"]
+  - apiGroups: [ "" ]
+    resources: [ "nodes" ]
+    verbs: [ "list", "watch" ]
 ---
 # Source: volcano/templates/controllers.yaml
 kind: ClusterRoleBinding

pkg/controllers/hypernode/hypernode_controller.go

@@ -55,6 +55,7 @@ type hyperNodeController struct {
 	hyperNodeInformer topologyinformerv1alpha1.HyperNodeInformer
 	hyperNodeLister   topologylisterv1alpha1.HyperNodeLister
 	hyperNodeQueue    workqueue.TypedRateLimitingInterface[string]
+	nodeLister        listersv1.NodeLister
 
 	configMapInformer coreinformers.ConfigMapInformer
 	configMapLister   listersv1.ConfigMapLister
@@ -113,6 +114,7 @@ func (hn *hyperNodeController) Initialize(opt *framework.ControllerOption) error
 	hn.hyperNodeInformer = hn.vcInformerFactory.Topology().V1alpha1().HyperNodes()
 	hn.hyperNodeLister = hn.hyperNodeInformer.Lister()
 	hn.hyperNodeQueue = workqueue.NewTypedRateLimitingQueue(workqueue.DefaultTypedControllerRateLimiter[string]())
+	hn.nodeLister = hn.informerFactory.Core().V1().Nodes().Lister()
 
 	hn.setConfigMapNamespaceAndName()
 	hn.setupConfigMapInformer()

pkg/controllers/hypernode/hypernode_handler.go

@@ -21,10 +21,13 @@ import (
 
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/klog/v2"
 
 	topologyv1alpha1 "volcano.sh/apis/pkg/apis/topology/v1alpha1"
+	"volcano.sh/volcano/pkg/scheduler/api"
 )
 
 func (hn *hyperNodeController) addHyperNode(obj interface{}) {
@@ -98,7 +101,7 @@ func (hn *hyperNodeController) syncHyperNodeStatus(key string) error {
 		return err
 	}
 
-	nodeCount := len(hyperNode.Spec.Members)
+	nodeCount := hn.actualNodeCnt(hyperNode)
 	if hyperNode.Status.NodeCount != int64(nodeCount) {
 		// Create a deep copy to avoid modifying cache objects
 		hyperNodeCopy := hyperNode.DeepCopy()
@@ -114,3 +117,16 @@ func (hn *hyperNodeController) syncHyperNodeStatus(key string) error {
 
 	return nil
 }
+
+func (hn *hyperNodeController) actualNodeCnt(hyperNode *topologyv1alpha1.HyperNode) int {
+	nodes, err := hn.nodeLister.List(labels.Everything())
+	if err != nil {
+		klog.ErrorS(err, "Failed to list nodes", "name", hyperNode.Name)
+		return 0
+	}
+	members := sets.New[string]()
+	for _, member := range hyperNode.Spec.Members {
+		members.Insert(api.GetMembers(member.Selector, nodes).UnsortedList()...)
+	}
+	return len(members)
+}