fix retaint operation

cybozu-go · Feb 1, 2024 · 7e11c1b · 7e11c1b
1 parent da844a0
commit 7e11c1b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/server/node_filter.go b/server/node_filter.go
@@ -431,14 +431,14 @@ func (nf *NodeFilter) KubeletStoppedNodes() (nodes []*cke.Node) {
 	return nodes
 }
 
-// KubeletStoppedRegisteredNodes returns nodes that are not running kubelet and are registered on Kubernetes.
-func (nf *NodeFilter) KubeletStoppedRegisteredNodes() (nodes []*cke.Node) {
+// RegisteredNodes returns nodes that are registered on Kubernetes out of targets.
+func (nf *NodeFilter) RegisteredNodes(target []*cke.Node) (nodes []*cke.Node) {
 	registered := make(map[string]bool)
 	for _, kn := range nf.status.Kubernetes.Nodes {
 		registered[kn.Name] = true
 	}
 
-	for _, n := range nf.KubeletStoppedNodes() {
+	for _, n := range target {
 		if registered[n.Nodename()] {
 			nodes = append(nodes, n)
 		}

diff --git a/server/strategy.go b/server/strategy.go
@@ -183,7 +183,7 @@ func k8sOps(c *cke.Cluster, nf *NodeFilter, cs *cke.ClusterStatus, maxConcurrent
 		if len(nodes) < max {
 			max = len(nodes)
 		}
-		ops = append(ops, k8s.KubeletBootOp(nodes[:max], nf.KubeletStoppedRegisteredNodes(), apiServer, c.Name, c.Options.Kubelet, cs.NodeStatuses))
+		ops = append(ops, k8s.KubeletBootOp(nodes[:max], nf.SSHConnectedNodes(nf.RegisteredNodes(nodes[:max]), true, true), apiServer, c.Name, c.Options.Kubelet, cs.NodeStatuses))
 	}
 	if nodes := nf.SSHConnectedNodes(nf.KubeletOutdatedNodes(), true, true); len(nodes) > 0 {
 		max := maxConcurrentUpdates