Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(main): delete .kube dir for all nodes #3911

Merged
merged 1 commit into from Sep 13, 2023
Merged

fix(main): delete .kube dir for all nodes #3911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions pkg/runtime/k3s/lifecycle.go
View file
Open in desktop
Expand Up @@ -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)
Expand Down
5 changes: 3 additions & 2 deletions pkg/runtime/kubernetes/reset.go
View file
Open in desktop
Expand Up @@ -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 && \
Expand Down Expand Up @@ -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()
Expand All @@ -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)
}
Expand Down