Merge pull request kosmos-io#760 from rxy0210/main

fix: fix kosmos-scheduler reschedule pv's pod
duanmengkk · Nov 25, 2024 · c87aed4 · c87aed4
2 parents 2202726 + 803a133
commit c87aed4
Show file tree

Hide file tree

Showing 9 changed files with 1,525 additions and 21 deletions.
diff --git a/pkg/clustertree/cluster-manager/controllers/pv/leaf_pv_controller.go b/pkg/clustertree/cluster-manager/controllers/pv/leaf_pv_controller.go
@@ -211,13 +211,13 @@ func filterPV(pv *v1.PersistentVolume, nodeName string) {
 		mfs := v.MatchFields
 		mes := v.MatchExpressions
 		for k, val := range v.MatchFields {
-			if val.Key == utils.NodeHostnameValue || val.Key == utils.NodeHostnameValueBeta {
+			if val.Key == utils.NodeHostnameValue || val.Key == utils.NodeHostnameValueBeta || val.Key == utils.OpenebsPVNodeLabel {
 				val.Values = []string{nodeName}
 			}
 			mfs[k] = val
 		}
 		for k, val := range v.MatchExpressions {
-			if val.Key == utils.NodeHostnameValue || val.Key == utils.NodeHostnameValueBeta {
+			if val.Key == utils.NodeHostnameValue || val.Key == utils.NodeHostnameValueBeta || val.Key == utils.OpenebsPVNodeLabel {
 				val.Values = []string{nodeName}
 			}
 			mes[k] = val

diff --git a/pkg/clustertree/cluster-manager/utils/leaf_model_handler.go b/pkg/clustertree/cluster-manager/utils/leaf_model_handler.go
@@ -205,7 +205,7 @@ func updateTaints(client kubernetes.Interface, taints []corev1.Taint, nodeName s
 	return nil
 }
 
-func createNode(ctx context.Context, clientset kubernetes.Interface, clusterName, nodeName, gitVersion string, listenPort int32) (*corev1.Node, error) {
+func createNode(ctx context.Context, clientset kubernetes.Interface, clusterName, nodeName, gitVersion string, listenPort int32, leafModel LeafMode) (*corev1.Node, error) {
 	nodeInRoot, err := clientset.CoreV1().Nodes().Get(ctx, nodeName, metav1.GetOptions{})
 	if err != nil {
 		if !errors.IsNotFound(err) {
@@ -217,6 +217,9 @@ func createNode(ctx context.Context, clientset kubernetes.Interface, clusterName
 		if nodeAnnotations == nil {
 			nodeAnnotations = make(map[string]string, 1)
 		}
+		if leafModel == ALL {
+			nodeAnnotations[nodeMode] = "one2cluster"
+		}
 		nodeAnnotations[utils.KosmosNodeOwnedByClusterAnnotations] = clusterName
 		nodeInRoot.SetAnnotations(nodeAnnotations)
 
@@ -243,8 +246,7 @@ func (h ClassificationHandler) CreateRootNode(ctx context.Context, listenPort in
 
 	if h.leafMode == ALL {
 		nodeNameInRoot := fmt.Sprintf("%s%s", utils.KosmosNodePrefix, cluster.Name)
-		nodeInRoot, err := createNode(ctx, h.RootClientset, cluster.Name, nodeNameInRoot, gitVersion, listenPort)
-		nodeInRoot.Annotations[nodeMode] = "one2cluster"
+		nodeInRoot, err := createNode(ctx, h.RootClientset, cluster.Name, nodeNameInRoot, gitVersion, listenPort, h.leafMode)
 		if err != nil {
 			return nil, nil, err
 		}
@@ -262,7 +264,7 @@ func (h ClassificationHandler) CreateRootNode(ctx context.Context, listenPort in
 				nodeNameInRoot = nodeNameInRoot[:63]
 			}
 
-			nodeInRoot, err := createNode(ctx, h.RootClientset, cluster.Name, nodeNameInRoot, gitVersion, listenPort)
+			nodeInRoot, err := createNode(ctx, h.RootClientset, cluster.Name, nodeNameInRoot, gitVersion, listenPort, h.leafMode)
 			if err != nil {
 				return nil, nil, err
 			}