Merge from hell #2: refactor start.go because it's terrible

Gopkg.toml

@@ -114,3 +114,7 @@
 [[constraint]]
   name = "github.com/google/go-cmp"
   version = "0.2.0"
+
+[[constraint]]
+  name = "golang.org/x/text"
+  branch = "master"

cmd/minikube/cmd/config/configure.go

@@ -149,8 +149,6 @@ var addonsConfigureCmd = &cobra.Command{
 			if err != nil {
 				console.Warning("ERROR creating `registry-creds-dpr` secret")
 			}
-
-			break
 		default:
 			console.Failure("%s has no available configuration options", addon)
 			return

cmd/minikube/cmd/delete.go

@@ -19,6 +19,8 @@ package cmd
 import (
 	"os"
 
+	"github.com/docker/machine/libmachine/mcnerror"
+	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	cmdUtil "k8s.io/minikube/cmd/util"
@@ -40,8 +42,8 @@ associated files.`,
 			console.ErrStyle("usage", "usage: minikube delete")
 			os.Exit(1)
 		}
-
-		console.OutStyle("stopping", "Deleting local Kubernetes cluster ...")
+		profile := viper.GetString(pkg_config.MachineProfile)
+		console.OutStyle("deleting-vm", "Deleting %q Kubernetes cluster ...", profile)
 		api, err := machine.NewAPIClient()
 		if err != nil {
 			console.Fatal("Error getting client: %v", err)
@@ -50,19 +52,30 @@ associated files.`,
 		defer api.Close()
 
 		if err = cluster.DeleteHost(api); err != nil {
-			console.Fatal("Errors occurred deleting machine: %v", err)
-			os.Exit(1)
+			switch err := errors.Cause(err).(type) {
+			case mcnerror.ErrHostDoesNotExist:
+				console.OutStyle("meh", "%q VM does not exist", profile)
+			default:
+				console.Fatal("Failed to delete VM: %v", err)
+				os.Exit(1)
+			}
+		} else {
+			console.OutStyle("crushed", "VM deleted.")
 		}
-		console.Success("Machine deleted.")
 
 		if err := cmdUtil.KillMountProcess(); err != nil {
-			console.Fatal("Errors occurred deleting mount process: %v", err)
+			console.Fatal("Failed to kill mount process: %v", err)
 		}
 
 		if err := os.Remove(constants.GetProfileFile(viper.GetString(pkg_config.MachineProfile))); err != nil {
-			console.Fatal("Error deleting machine profile config: %v", err)
+			if os.IsNotExist(err) {
+				console.OutStyle("meh", "%q profile does not exist", profile)
+				os.Exit(0)
+			}
+			console.Fatal("Failed to remove profile: %v", err)
 			os.Exit(1)
 		}
+		console.Success("Removed %q profile!", profile)
 	},
 }
 

cmd/minikube/cmd/stop.go

@@ -20,9 +20,13 @@ import (
 	"os"
 	"time"
 
+	"github.com/docker/machine/libmachine/mcnerror"
+	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 	cmdUtil "k8s.io/minikube/cmd/util"
 	"k8s.io/minikube/pkg/minikube/cluster"
+	pkg_config "k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/console"
 	"k8s.io/minikube/pkg/minikube/machine"
 	pkgutil "k8s.io/minikube/pkg/util"
@@ -35,25 +39,39 @@ var stopCmd = &cobra.Command{
 	Long: `Stops a local kubernetes cluster running in Virtualbox. This command stops the VM
 itself, leaving all files intact. The cluster can be started again with the "start" command.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		console.OutStyle("stopping", "Stopping local Kubernetes cluster...")
+		profile := viper.GetString(pkg_config.MachineProfile)
+		console.OutStyle("stopping", "Stopping %q Kubernetes cluster...", profile)
+
 		api, err := machine.NewAPIClient()
 		if err != nil {
 			console.Fatal("Error getting client: %v", err)
 			os.Exit(1)
 		}
 		defer api.Close()
 
+		nonexistent := false
+
 		stop := func() (err error) {
-			return cluster.StopHost(api)
+			err = cluster.StopHost(api)
+			switch err := errors.Cause(err).(type) {
+			case mcnerror.ErrHostDoesNotExist:
+				console.OutStyle("meh", "%q VM does not exist, nothing to stop", profile)
+				nonexistent = true
+				return nil
+			default:
+				return err
+			}
 		}
 		if err := pkgutil.RetryAfter(5, stop, 1*time.Second); err != nil {
-			console.Fatal("Error stopping machine: %v", err)
+			console.Fatal("Unable to stop VM: %v", err)
 			cmdUtil.MaybeReportErrorAndExit(err)
 		}
-		console.OutStyle("stopped", "Machine stopped.")
+		if !nonexistent {
+			console.OutStyle("stopped", "%q stopped.", profile)
+		}
 
 		if err := cmdUtil.KillMountProcess(); err != nil {
-			console.Fatal("Errors occurred deleting mount process: %v", err)
+			console.Fatal("Unable to kill mount process: %v", err)
 		}
 	},
 }

cmd/minikube/main.go

@@ -40,7 +40,7 @@ func main() {
 	}
 	console.SetOutFile(os.Stdout)
 	console.SetErrFile(os.Stderr)
-	err := console.SetLanguage(os.Getenv("LANG"))
+	err := console.SetPreferredLanguage(os.Getenv("LANG"))
 	if err != nil {
 		glog.Warningf("unable to detect language: %v", err)
 	}

cmd/util/util.go

@@ -157,7 +157,6 @@ To disable this prompt, run: 'minikube config set WantReportErrorPrompt false'
 	if err != nil {
 		glog.Infof("report error failed: %v", err)
 	}
-	console.ErrStyle("embarassed", "minikube failed, exiting with error code %d", returnCode)
 	os.Exit(returnCode)
 }
 

pkg/minikube/bootstrapper/kubeadm/kubeadm.go

@@ -187,6 +187,8 @@ func (k *KubeadmBootstrapper) StartCluster(k8s config.KubernetesConfig) error {
 		}
 	}
 
+	// NOTE: We have not yet asserted that we can access the apiserver. Now would be a great time to do so.
+	console.OutStyle("permissions", "Setting up cluster admin privileges ...")
 	if err := util.RetryAfter(100, elevateKubeSystemPrivileges, time.Millisecond*500); err != nil {
 		return errors.Wrap(err, "timed out waiting to elevate kube-system RBAC privileges")
 	}
@@ -241,6 +243,9 @@ func (k *KubeadmBootstrapper) RestartCluster(k8s config.KubernetesConfig) error
 			return errors.Wrapf(err, "running cmd: %s", cmd)
 		}
 	}
+
+	// NOTE: Perhaps now would be a good time to check apiserver health?
+	console.OutStyle("waiting", "Restarting kube-proxy ...")
 	if err := restartKubeProxy(k8s); err != nil {
 		return errors.Wrap(err, "restarting kube-proxy")
 	}
@@ -354,10 +359,10 @@ func (k *KubeadmBootstrapper) UpdateCluster(cfg config.KubernetesConfig) error {
 			}
 			f, err := assets.NewFileAsset(path, "/usr/bin", bin, "0641")
 			if err != nil {
-				return errors.Wrap(err, "making new file asset")
+				return errors.Wrap(err, "new file asset")
 			}
 			if err := k.c.Copy(f); err != nil {
-				return errors.Wrapf(err, "transferring kubeadm file: %+v", f)
+				return errors.Wrapf(err, "copy")
 			}
 			return nil
 		})
@@ -367,15 +372,14 @@ func (k *KubeadmBootstrapper) UpdateCluster(cfg config.KubernetesConfig) error {
 	}
 
 	if err := addAddons(&files); err != nil {
-		return errors.Wrap(err, "adding addons to copyable files")
+		return errors.Wrap(err, "adding addons")
 	}
 
 	for _, f := range files {
 		if err := k.c.Copy(f); err != nil {
-			return errors.Wrapf(err, "transferring kubeadm file: %+v", f)
+			return errors.Wrapf(err, "copy")
 		}
 	}
-
 	err = k.c.Run(`
 sudo systemctl daemon-reload &&
 sudo systemctl enable kubelet &&
@@ -483,7 +487,7 @@ func maybeDownloadAndCache(binary, version string) (string, error) {
 	options.Checksum = constants.GetKubernetesReleaseURLSha1(binary, version)
 	options.ChecksumHash = crypto.SHA1
 
-	console.OutStyle("download", "Downloading %s %s", binary, version)
+	console.OutStyle("file-download", "Downloading %s %s", binary, version)
 	if err := download.ToFile(url, targetFilepath, options); err != nil {
 		return "", errors.Wrapf(err, "Error downloading %s %s", binary, version)
 	}