Merge pull request #1666 from zhangzhiqiangcs/fix-remove-node-check

fix remove node check
kubesphere · Dec 20, 2022 · 0be93c5 · 0be93c5
2 parents db8aca4 + 2d7bb0c
commit 0be93c5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cmd/kk/pkg/kubernetes/tasks.go b/cmd/kk/pkg/kubernetes/tasks.go
@@ -491,7 +491,7 @@ type FindNode struct {
 func (f *FindNode) Execute(runtime connector.Runtime) error {
 	var resArr []string
 	res, err := runtime.GetRunner().Cmd(
-		"sudo -E /usr/local/bin/kubectl get nodes | grep -v NAME | grep -v 'master\\|control-plane' | awk '{print $1}'",
+		"sudo -E /usr/local/bin/kubectl get nodes | awk '$3 !~ /master|control-plane|ROLES/ {print $1}'",
 		true)
 	if err != nil {
 		return errors.Wrap(errors.WithStack(err), "kubectl get nodes failed")