fix re-taint operation only applied to KubeletBootOp target node #699
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
YZ775
changed the title
masa213f
requested changes
Feb 2, 2024
server/strategy.go
Outdated
| @@ -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)) | |||
There was a problem hiding this comment.
nodes is already filterd in L181. So we need not to filter again here.
Suggested change
| ops = append(ops, k8s.KubeletBootOp(nodes[:max], nf.SSHConnectedNodes(nf.RegisteredNodes(nodes[:max]), true, true), apiServer, c.Name, c.Options.Kubelet, cs.NodeStatuses)) | |
| ops = append(ops, k8s.KubeletBootOp(nodes[:max], nf.RegisteredNodes(nodes[:max]), apiServer, c.Name, c.Options.Kubelet, cs.NodeStatuses)) |
There was a problem hiding this comment.
Thank you, it's my mistake.
I fixed it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There are problem that when CKE is unable to SSH to nodes, it adds taints even if it is not necessary.
In order to fix this, I changed re-taint process to be done only on the target node of
KubeletBootOp.