66 "fmt"
77 "os"
88 "os/exec"
9+ "time"
910
1011 autopilot "github.com/k0sproject/k0s/pkg/apis/autopilot/v1beta2"
1112 "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1"
@@ -91,6 +92,8 @@ func (h *hostInfo) drainNode() error {
9192 "drain" ,
9293 "--ignore-daemonsets" ,
9394 "--delete-emptydir-data" ,
95+ "--delete-local-data" ,
96+ "--timeout" , "60s" ,
9497 h .Hostname ,
9598 }
9699 out , err := exec .Command (k0s , drainArgList ... ).CombinedOutput ()
@@ -260,7 +263,7 @@ func newHostInfo(c *cli.Context) (hostInfo, error) {
260263 currentHost .configureKubernetesClient ()
261264 // fetch node object
262265 currentHost .getNodeObject (c .Context )
263- // control plane only stff
266+ // control plane only stuff
264267 if currentHost .Status .Role == "controller" {
265268 // fetch controlNode
266269 currentHost .getControlNodeObject (c .Context )
@@ -344,7 +347,9 @@ var resetCommand = &cli.Command{
344347
345348 // remove node from cluster
346349 logrus .Info ("Removing node from cluster..." )
347- err = currentHost .deleteNode (c .Context )
350+ removeCtx , removeCancel := context .WithTimeout (c .Context , time .Minute )
351+ defer removeCancel ()
352+ err = currentHost .deleteNode (removeCtx )
348353 if ! checkErrPrompt (c , err ) {
349354 return err
350355 }
@@ -353,7 +358,9 @@ var resetCommand = &cli.Command{
353358 if currentHost .Status .Role == "controller" {
354359
355360 // delete controlNode object from cluster
356- err := currentHost .deleteControlNode (c .Context )
361+ deleteControlCtx , deleteCancel := context .WithTimeout (c .Context , time .Minute )
362+ defer deleteCancel ()
363+ err := currentHost .deleteControlNode (deleteControlCtx )
357364 if ! checkErrPrompt (c , err ) {
358365 return err
359366 }
0 commit comments