diff --git a/pkg/runtime/k3s/lifecycle.go b/pkg/runtime/k3s/lifecycle.go index fefc5b376f5..d34651e6da6 100644 --- a/pkg/runtime/k3s/lifecycle.go +++ b/pkg/runtime/k3s/lifecycle.go @@ -41,6 +41,11 @@ func (k *K3s) resetNodes(nodes []string) error { func (k *K3s) resetNode(host string) error { logger.Info("start to reset node: %s", host) + removeKubeConfig := "rm -rf $HOME/.kube" + removeKubeConfigErr := k.sshClient.CmdAsync(host, removeKubeConfig) + if removeKubeConfigErr != nil { + logger.Error("failed to clean node, exec command %s failed, %v", removeKubeConfig, removeKubeConfigErr) + } if slices.Contains(k.cluster.GetNodeIPList(), host) { vipAndPort := fmt.Sprintf("%s:%d", k.cluster.GetVIP(), k.config.APIServerPort) ipvscleanErr := k.remoteUtil.IPVSClean(host, vipAndPort) diff --git a/pkg/runtime/kubernetes/reset.go b/pkg/runtime/kubernetes/reset.go index 2a3c9c2dd8d..2d65ae992cd 100644 --- a/pkg/runtime/kubernetes/reset.go +++ b/pkg/runtime/kubernetes/reset.go @@ -25,7 +25,7 @@ import ( ) const ( - removeKubeConfig = "rm -rf .kube" + removeKubeConfig = "rm -rf $HOME/.kube" remoteCleanMasterOrNode = `if which kubeadm;then kubeadm reset -f %s;fi && \ rm -rf /etc/kubernetes/ && \ rm -rf /etc/cni && rm -rf /opt/cni && \ @@ -68,7 +68,7 @@ func (k *KubeadmRuntime) resetMasters(nodes []string) { func (k *KubeadmRuntime) resetNode(node string, cleanHook func()) error { logger.Info("start to reset node: %s", node) resetCmd := fmt.Sprintf(remoteCleanMasterOrNode, vlogToStr(k.klogLevel), k.getEtcdDataDir()) - removeKubeConfigErr := k.sshCmdAsync(node, removeKubeConfig) + resetCmdErr := k.sshCmdAsync(node, resetCmd) if cleanHook != nil { cleanHook() @@ -77,6 +77,7 @@ func (k *KubeadmRuntime) resetNode(node string, cleanHook func()) error { if resetCmdErr != nil { logger.Error("failed to clean node, exec command %s failed, %v", resetCmd, resetCmdErr) } + removeKubeConfigErr := k.sshCmdAsync(node, removeKubeConfig) if removeKubeConfigErr != nil { logger.Error("failed to clean node, exec command %s failed, %v", removeKubeConfig, removeKubeConfigErr) }