rdctl factory-reset now kills the app and never waits.

Signed-off-by: Eric Promislow <[email protected]>

Author: ericpromislow

src/go/rdctl/cmd/factoryReset.go

@@ -42,6 +42,7 @@ Use the --remove-kubernetes-cache=BOOLEAN flag to also remove the cached Kuberne
 			logrus.SetLevel(logrus.TraceLevel)
 		}
 		cmd.SilenceUsage = true
+		commonShutdownSettings.WaitForShutdown = false
 		_, err := doShutdown(&commonShutdownSettings)
 		if err != nil {
 			return err
@@ -54,5 +55,4 @@ func init() {
 	rootCmd.AddCommand(factoryResetCmd)
 	factoryResetCmd.Flags().BoolVar(&removeKubernetesCache, "remove-kubernetes-cache", false, "If specified, also removes the cached Kubernetes images.")
 	factoryResetCmd.Flags().BoolVar(&commonShutdownSettings.Verbose, "verbose", false, "Be verbose")
-	factoryResetCmd.Flags().BoolVar(&commonShutdownSettings.WaitForShutdown, "wait", true, "Don't wait for shutdown to be confirmed")
 }

src/go/rdctl/cmd/shutdown.go

@@ -84,9 +84,6 @@ func doShutdown(shutdownSettings *shutdownSettingsStruct) ([]byte, error) {
 		}
 		return nil, err
 	}
-	if !shutdownSettings.WaitForShutdown {
-		return output, nil
-	}
-	err = shutdown.FinishShutdown()
+	err = shutdown.FinishShutdown(shutdownSettings.WaitForShutdown)
 	return output, err
 }

src/go/rdctl/pkg/factoryreset/delete_data.go

@@ -139,7 +139,7 @@ func deleteUnixLikeData(homeDir string, altAppHomePath string, configHomePath st
 	}
 	for _, currentPath := range pathList {
 		if err := os.RemoveAll(currentPath); err != nil {
-			logrus.Errorf("Error trying to remove %s: %w", currentPath, err)
+			logrus.Errorf("Error trying to remove %s: %s", currentPath, err)
 		}
 	}
 	if err := clearDockerContext(); err != nil {

src/go/rdctl/pkg/factoryreset/factory_reset_windows.go

@@ -31,7 +31,7 @@ import (
 )
 
 func KillRancherDesktop() {
-	cmd := exec.Command("taskkill", "/IM", "Rancher Desktop", "/T", "/F")
+	cmd := exec.Command("taskkill", "/IM", "Rancher Desktop.exe", "/T", "/F")
 	cmd.SysProcAttr = &syscall.SysProcAttr{CreationFlags: CREATE_NO_WINDOW}
 	cmd.Run()
 }

src/go/rdctl/pkg/shutdown/shutdown.go

@@ -30,24 +30,24 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-func FinishShutdown() error {
+func FinishShutdown(waitForShutdown bool) error {
 	switch runtime.GOOS {
 	case "darwin":
-		doCheckWithTimeout(checkProcessQemu, pkillQemu, 15, 2, "qemu")
-		doCheckWithTimeout(checkProcessDarwin, pkillDarwin, 5, 1, "the app")
+		doCheckWithTimeout(checkProcessQemu, pkillQemu, waitForShutdown, 15, 2, "qemu")
+		doCheckWithTimeout(checkProcessDarwin, pkillDarwin, waitForShutdown, 5, 1, "the app")
 	case "linux":
-		doCheckWithTimeout(checkProcessQemu, pkillQemu, 15, 2, "qemu")
-		doCheckWithTimeout(checkProcessLinux, pkillLinux, 5, 1, "the app")
+		doCheckWithTimeout(checkProcessQemu, pkillQemu, waitForShutdown, 15, 2, "qemu")
+		doCheckWithTimeout(checkProcessLinux, pkillLinux, waitForShutdown, 5, 1, "the app")
 	case "windows":
-		doCheckWithTimeout(checkProcessWindows, factoryreset.KillRancherDesktop, 15, 2, "the app")
+		doCheckWithTimeout(checkProcessWindows, factoryreset.KillRancherDesktop, waitForShutdown, 15, 2, "the app")
 	default:
 		return fmt.Errorf("unhandled runtime: %s", runtime.GOOS)
 	}
 	return nil
 }
 
-func doCheckWithTimeout(checkFunc func() bool, killFunc func(), retryCount int, retryWait int, operation string) {
-	for iter := 0; iter < retryCount; iter++ {
+func doCheckWithTimeout(checkFunc func() bool, killFunc func(), waitForShutdown bool, retryCount int, retryWait int, operation string) {
+	for iter := 0; waitForShutdown && iter < retryCount; iter++ {
 		if iter > 0 {
 			logrus.Debugf("checking %s showed it's still running; sleeping %d seconds\n", operation, retryWait)
 			time.Sleep(time.Duration(retryWait) * time.Second)
@@ -111,13 +111,13 @@ func checkProcessQemu() bool {
 }
 
 func pkillQemu() {
-	exec.Command("pkill", "-f", RancherDesktopQemuCommand).Run()
+	exec.Command("pkill", "-9", "-f", RancherDesktopQemuCommand).Run()
 }
 
 func pkillDarwin() {
-	exec.Command("pkill", "-f", "Contents/MacOS/Rancher Desktop").Run()
+	exec.Command("pkill", "-9", "-f", "Contents/MacOS/Rancher Desktop").Run()
 }
 
 func pkillLinux() {
-	exec.Command("pkill", "rancher-desktop").Run()
+	exec.Command("pkill", "-9", "rancher-desktop").Run()
 }