fix(kwok): fix panic when scale down node group

kubernetes · Dec 2, 2023 · 3a67a32 · 3a67a32
1 parent 85b6058
commit 3a67a32
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/cluster-autoscaler/cloudprovider/kwok/kwok_helpers.go b/cluster-autoscaler/cloudprovider/kwok/kwok_helpers.go
@@ -25,7 +25,6 @@ import (
 	"log"
 	"strconv"
 	"strings"
-	"time"
 
 	apiv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -155,13 +154,19 @@ func createNodegroups(nodes []*apiv1.Node, kubeClient kubernetes.Interface, kc *
 		}
 
 		ngName := getNGName(nodes[i], kc)
+		if ngName == "" {
+			klog.Fatalf("%s '%s' for node '%s' not present in the manifest",
+				kc.status.groupNodesBy, kc.status.key,
+				nodes[i].GetName())
+		}
+
 		if ngs[ngName] != nil {
 			ngs[ngName].targetSize += 1
 			continue
 		}
 
 		ng := parseAnnotations(nodes[i], kc)
-		ng.name = getNGName(nodes[i], kc)
+		ng.name = ngName
 		sanitizeNode(nodes[i])
 		prepareNode(nodes[i], ng.name)
 		ng.nodeTemplate = nodes[i]
@@ -266,13 +271,5 @@ func getNGName(no *apiv1.Node, kc *KwokProviderConfig) string {
 		klog.Fatal("grouping criteria for nodes is not set (expected: 'annotation' or 'label')")
 	}
 
-	if ngName == "" {
-		klog.Fatalf("%s '%s' for node '%s' not present in the manifest",
-			kc.status.groupNodesBy, kc.status.key,
-			no.GetName())
-	}
-
-	ngName = fmt.Sprintf("%s-%v", ngName, time.Now().Unix())
-
 	return ngName
 }
diff --git a/cluster-autoscaler/cloudprovider/kwok/kwok_nodegroups.go b/cluster-autoscaler/cloudprovider/kwok/kwok_nodegroups.go
@@ -111,6 +111,7 @@ func (nodeGroup *NodeGroup) DeleteNodes(nodes []*apiv1.Node) error {
 		if err != nil {
 			return err
 		}
+		nodeGroup.targetSize -= 1
 	}
 	return nil
 }