make error message more clear

Author: norshtein

cmd/minikube/cmd/config/disable.go

@@ -33,12 +33,15 @@ var addonsDisableCmd = &cobra.Command{
 		if len(args) != 1 {
 			exit.Message(reason.Usage, "usage: minikube addons disable ADDON_NAME")
 		}
-
+		err := addons.CheckPaused(ClusterFlagValue(), "false")
+		if err != nil {
+			exit.Error(reason.InternalAddonDisablePaused, "disable failed", err)
+		}
 		addon := args[0]
 		if addon == "heapster" {
 			exit.Message(reason.AddonUnsupported, "The heapster addon is depreciated. please try to disable metrics-server instead")
 		}
-		err := addons.SetAndSave(ClusterFlagValue(), addon, "false")
+		err = addons.SetAndSave(ClusterFlagValue(), addon, "false")
 		if err != nil {
 			exit.Error(reason.InternalAddonDisable, "disable failed", err)
 		}

cmd/minikube/cmd/config/enable.go

@@ -39,6 +39,10 @@ var addonsEnableCmd = &cobra.Command{
 		if len(args) != 1 {
 			exit.Message(reason.Usage, "usage: minikube addons enable ADDON_NAME")
 		}
+		err := addons.CheckPaused(ClusterFlagValue(), "true")
+		if err != nil {
+			exit.Error(reason.InternalAddonEnablePaused, "enabled failed", err)
+		}
 		addon := args[0]
 		isDeprecated, replacement, msg := addons.Deprecations(addon)
 		if isDeprecated && replacement == "" {
@@ -68,7 +72,7 @@ You can view the list of minikube maintainers at: https://github.com/kubernetes/
 		}
 		viper.Set(config.AddonImages, images)
 		viper.Set(config.AddonRegistries, registries)
-		err := addons.SetAndSave(ClusterFlagValue(), addon, "true")
+		err = addons.SetAndSave(ClusterFlagValue(), addon, "true")
 		if err != nil && !errors.Is(err, addons.ErrSkipThisAddon) {
 			exit.Error(reason.InternalAddonEnable, "enable failed", err)
 		}

pkg/addons/addons.go

@@ -281,24 +281,6 @@ func EnableOrDisableAddon(cc *config.ClusterConfig, name string, val string) err
 		return errors.Wrap(err, "command runner")
 	}
 
-	crName := cc.KubernetesConfig.ContainerRuntime
-	cr, err := cruntime.New(cruntime.Config{Type: crName, Runner: runner})
-	if err != nil {
-		return errors.Wrap(err, "container runtime")
-	}
-	runtimePaused, err := cluster.CheckIfPaused(cr, []string{"kube-system"})
-	if err != nil {
-		return errors.Wrap(err, "check paused")
-	}
-	if runtimePaused {
-		action := "disable"
-		if enable {
-			action = "enable"
-		}
-		msg := fmt.Sprintf("can't %s addon on a paused cluster, please unpause the cluster firstly.", action)
-		out.Styled(style.Shrug, msg)
-		return errors.New(msg)
-	}
 	bail, err := addonSpecificChecks(cc, name, enable, runner)
 	if err != nil {
 		return err
@@ -590,3 +572,59 @@ func UpdateConfig(cc *config.ClusterConfig, enabled []string) {
 		}
 	}
 }
+
+// CheckPaused checks whether the cluster is paused before enable/disable an addon.
+func CheckPaused(profile string, val string) error {
+	klog.Info("checking whether the cluster is paused")
+
+	enable, err := strconv.ParseBool(val)
+	if err != nil {
+		return errors.Wrapf(err, "parsing bool: %s", val)
+	}
+
+	cc, err := config.Load(profile)
+	if err != nil {
+		return errors.Wrap(err, "loading profile")
+	}
+
+	api, err := machine.NewAPIClient()
+	if err != nil {
+		return errors.Wrap(err, "machine client")
+	}
+	defer api.Close()
+
+	cp, err := config.PrimaryControlPlane(cc)
+	if err != nil {
+		exit.Error(reason.GuestCpConfig, "Error getting primary control plane", err)
+	}
+
+	host, err := machine.LoadHost(api, config.MachineName(*cc, cp))
+	if err != nil {
+		exit.Error(reason.GuestLoadHost, "Error getting host", err)
+	}
+
+	runner, err := machine.CommandRunner(host)
+	if err != nil {
+		return errors.Wrap(err, "command runner")
+	}
+
+	crName := cc.KubernetesConfig.ContainerRuntime
+	cr, err := cruntime.New(cruntime.Config{Type: crName, Runner: runner})
+	if err != nil {
+		return errors.Wrap(err, "container runtime")
+	}
+	runtimePaused, err := cluster.CheckIfPaused(cr, []string{"kube-system"})
+	if err != nil {
+		return errors.Wrap(err, "check paused")
+	}
+	if runtimePaused {
+		action := "disable"
+		if enable {
+			action = "enable"
+		}
+		msg := fmt.Sprintf("can't %s addon on a paused cluster, please unpause the cluster firstly.", action)
+		out.Styled(style.Shrug, msg)
+		return errors.New(msg)
+	}
+	return nil
+}

pkg/minikube/reason/reason.go

@@ -80,6 +80,11 @@ var (
 	InternalAddonDisable = Kind{ID: "MK_ADDON_DISABLE", ExitCode: ExProgramError}
 	// minikube could not enable an addon, e.g. dashboard addon
 	InternalAddonEnable = Kind{ID: "MK_ADDON_ENABLE", ExitCode: ExProgramError}
+	// minikube could not enable an addon on a paused cluster
+	InternalAddonEnablePaused = Kind{ID: "MK_ADDON_ENABLE_PAUSED", ExitCode: ExProgramConflict}
+	// minikube could not disable an addon on a paused cluster
+	InternalAddonDisablePaused = Kind{ID: "MK_ADDON_DISABLE_PAUSED", ExitCode: ExProgramConflict}
+
 	// minikube failed to update internal configuration, such as the cached images config map
 	InternalAddConfig = Kind{ID: "MK_ADD_CONFIG", ExitCode: ExProgramError}
 	// minikube failed to create a cluster bootstrapper