Merge pull request #1877 from hellocn9/stopkubelet

stop kubelet service first when remove worker node.
kubesphere · Jun 19, 2023 · 04af403 · 04af403
2 parents 88bffbd + abf5b0d
commit 04af403
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/cmd/kk/pkg/bootstrap/os/module.go b/cmd/kk/pkg/bootstrap/os/module.go
@@ -103,6 +103,15 @@ type ClearNodeOSModule struct {
 func (c *ClearNodeOSModule) Init() {
 	c.Name = "ClearNodeOSModule"
 
+	stopKubelet := &task.RemoteTask{
+		Name:     "StopKubelet",
+		Desc:     "Stop Kubelet",
+		Hosts:    c.Runtime.GetHostsByRole(common.Worker),
+		Prepare:  new(DeleteNode),
+		Action:   new(StopKubelet),
+		Parallel: true,
+	}
+
 	resetNetworkConfig := &task.RemoteTask{
 		Name:     "ResetNetworkConfig",
 		Desc:     "Reset os network config",
@@ -131,6 +140,7 @@ func (c *ClearNodeOSModule) Init() {
 	}
 
 	c.Tasks = []task.Interface{
+		stopKubelet,
 		resetNetworkConfig,
 		removeFiles,
 		daemonReload,

diff --git a/cmd/kk/pkg/bootstrap/os/tasks.go b/cmd/kk/pkg/bootstrap/os/tasks.go
@@ -197,6 +197,15 @@ func (r *ResetNetworkConfig) Execute(runtime connector.Runtime) error {
 	return nil
 }
 
+type StopKubelet struct {
+	common.KubeAction
+}
+
+func (s *StopKubelet) Execute(runtime connector.Runtime) error {
+	_, _ = runtime.GetRunner().SudoCmd("systemctl disable kubelet && systemctl stop kubelet && exit 0", false)
+	return nil
+}
+
 type UninstallETCD struct {
 	common.KubeAction
 }