Merge pull request #3930 from gy95/automated-cherry-pick-of-#3871-upstream-release-1.11v1.11.0

Automated cherry pick of #3871: fix keadm beta reset failed on edge node

2 files changed, 21 insertions, 19 deletions

diff --git a/keadm/cmd/keadm/app/cmd/reset.go b/keadm/cmd/keadm/app/cmd/reset.go
index 9d25bb641..0b78346ff 100644
--- a/keadm/cmd/keadm/app/cmd/reset.go
+++ b/keadm/cmd/keadm/app/cmd/reset.go
@@ -58,7 +58,7 @@ func newResetOptions() *common.ResetOptions {
 }
 
 func NewKubeEdgeReset() *cobra.Command {
-	IsEdgeNode := false
+	isEdgeNode := false
 	reset := newResetOptions()
 
 	var cmd = &cobra.Command{
@@ -67,17 +67,16 @@ func NewKubeEdgeReset() *cobra.Command {
 		Long:    resetLongDescription,
 		Example: resetExample,
 		PreRunE: func(cmd *cobra.Command, args []string) error {
-			whoRunning, err := util.RunningModuleV2(reset)
-			if err != nil {
-				return err
-			}
-			switch whoRunning {
-			case common.KubeEdgeEdgeRunning:
-				IsEdgeNode = true
-			case common.NoneRunning:
+			whoRunning := util.RunningModuleV2(reset)
+			if whoRunning == common.NoneRunning {
 				fmt.Println("None of KubeEdge components are running in this host, exit")
 				os.Exit(0)
 			}
+
+			if whoRunning == common.KubeEdgeEdgeRunning {
+				isEdgeNode = true
+			}
+
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -95,17 +94,17 @@ func NewKubeEdgeReset() *cobra.Command {
 			}
 			// 1. kill cloudcore/edgecore process.
 			// For edgecore, don't delete node from K8S
-			if err := TearDownKubeEdge(IsEdgeNode, reset.Kubeconfig); err != nil {
+			if err := TearDownKubeEdge(isEdgeNode, reset.Kubeconfig); err != nil {
 				return err
 			}
 
 			// 2. Remove containers managed by KubeEdge. Only for edge node.
-			if err := RemoveContainers(IsEdgeNode, utilsexec.New()); err != nil {
+			if err := RemoveContainers(isEdgeNode, utilsexec.New()); err != nil {
 				fmt.Printf("Failed to remove containers: %v\n", err)
 			}
 
 			// 3. Clean stateful directories
-			if err := cleanDirectories(IsEdgeNode); err != nil {
+			if err := cleanDirectories(isEdgeNode); err != nil {
 				return err
 			}
 
diff --git a/keadm/cmd/keadm/app/cmd/util/common.go b/keadm/cmd/keadm/app/cmd/util/common.go
index 90e4b1851..a652b4ce0 100644
--- a/keadm/cmd/keadm/app/cmd/util/common.go
+++ b/keadm/cmd/keadm/app/cmd/util/common.go
@@ -149,24 +149,27 @@ func GetOSInterface() types.OSTypeInstaller {
 
 // RunningModuleV2 identifies cloudcore/edgecore running or not.
 // only used for cloudcore container install and edgecore binary install
-func RunningModuleV2(opt *types.ResetOptions) (types.ModuleRunning, error) {
+func RunningModuleV2(opt *types.ResetOptions) types.ModuleRunning {
 	osType := GetOSInterface()
 	cloudCoreRunning, err := IsCloudcoreContainerRunning(constants.SystemNamespace, opt.Kubeconfig)
 	if err != nil {
-		return types.NoneRunning, err
+		// just log the error, maybe we do not care
+		klog.Warningf("failed to check cloudcore is running: %v", err)
 	}
 	if cloudCoreRunning {
-		return types.KubeEdgeCloudRunning, nil
+		return types.KubeEdgeCloudRunning
 	}
 
 	edgeCoreRunning, err := osType.IsKubeEdgeProcessRunning(KubeEdgeBinaryName)
+	if err != nil {
+		// just log the error, maybe we do not care
+		klog.Warningf("failed to check edgecore is running: %v", err)
+	}
 	if edgeCoreRunning {
-		return types.KubeEdgeEdgeRunning, nil
-	} else if err != nil {
-		return types.NoneRunning, err
+		return types.KubeEdgeEdgeRunning
 	}
 
-	return types.NoneRunning, nil
+	return types.NoneRunning
 }
 
 // RunningModule identifies cloudcore/edgecore running or not.