Merge remote-tracking branch 'origin/master' into update-context

Author: abbytiz

cmd/minikube/cmd/status.go

@@ -79,7 +79,7 @@ var statusCmd = &cobra.Command{
 			if kstatus {
 				ks = "Correctly Configured: pointing to minikube-vm at " + ip.String()
 			} else {
-				ks = "Misconfigured: pointing to stale minikube-vm" +
+				ks = "Misconfigured: pointing to stale minikube-vm." +
 					"\nTo fix the kubectl context, run minikube update-context"
 			}
 		}

cmd/minikube/cmd/update-context.go

@@ -53,9 +53,9 @@ var updateContextCmd = &cobra.Command{
 			cmdUtil.MaybeReportErrorAndExit(err)
 		}
 		if kstatus {
-			fmt.Println("Reconfigured: pointing to minikube-vm at " + ip.String())
+			fmt.Println("Reconfigured kubeconfig IP, now pointing at " + ip.String())
 		} else {
-			fmt.Println("Correctly Configured: pointing to minikube-vm at " + ip.String())
+			fmt.Println("Kubeconfig IP correctly configured, pointing at " + ip.String())
 		}
 
 	},

pkg/minikube/kubeconfig/config.go

@@ -197,7 +197,7 @@ func GetKubeConfigStatus(ip net.IP, filename string) (bool, error) {
 	if kip.Equal(ip) {
 		return true, nil
 	}
-	// Kubeconfig IP Misconfigured
+	// Kubeconfig IP misconfigured
 	return false, nil
 
 }
@@ -218,11 +218,11 @@ func UpdateKubeconfigIP(ip net.IP, filename string) (bool, error) {
 	if err != nil {
 		return false, errors.Wrap(err, "Error getting kubeconfig status")
 	}
-	// Safe to access server because getIPFromKubeConfig would have given an error if not safe
+	// Safe to lookup server because if field non-existent getIPFromKubeconfig would have given an error
 	con.Clusters[cfg.GetMachineName()].Server = "https://" + ip.String() + ":" + strconv.Itoa(constants.APIServerPort)
 	err = WriteConfig(con, filename)
 	if err != nil {
-		return false, nil
+		return false, err
 	}
 	// Kubeconfig IP reconfigured
 	return true, nil
@@ -236,7 +236,7 @@ func getIPFromKubeConfig(filename string) (net.IP, error) {
 	}
 	cluster, ok := con.Clusters[cfg.GetMachineName()]
 	if !ok {
-		return nil, errors.Errorf("Kubeconfig does not have a record of a minikube cluster")
+		return nil, errors.Errorf("Kubeconfig does not have a record of the machine cluster")
 	}
 	kurl, err := url.Parse(cluster.Server)
 	if err != nil {