From 2eeef75457d526910c460904875d63916619e4dc Mon Sep 17 00:00:00 2001
From: dlorenc <lorenc.d@gmail.com>
Date: Sun, 29 Apr 2018 18:14:20 -0700
Subject: [PATCH] Update to go 1.10.1 everywhere.

---
 .travis.yml               | 2 +-
 Makefile                  | 4 ++--
 cmd/minikube/cmd/start.go | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4b5c28e8b3dc..59977c765a3e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ os: linux
 sudo: required
 
 go:
-  - 1.9.x
+  - 1.10.x
 go_import_path: k8s.io/minikube
 
 install:
diff --git a/Makefile b/Makefile
index 6e298113e841..554d82be3852 100755
--- a/Makefile
+++ b/Makefile
@@ -22,8 +22,8 @@ INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1)
 BUILDROOT_BRANCH ?= 2017.11
 REGISTRY?=gcr.io/k8s-minikube
 
-HYPERKIT_BUILD_IMAGE 	?= karalabe/xgo-1.8.3
-BUILD_IMAGE 	?= k8s.gcr.io/kube-cross:v1.9.1-1
+HYPERKIT_BUILD_IMAGE 	?= karalabe/xgo-1.10.x
+BUILD_IMAGE 	?= k8s.gcr.io/kube-cross:v1.10.1-1
 ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image
 
 ISO_VERSION ?= v0.26.0
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 6ed188f86523..622986998d3f 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -321,8 +321,7 @@ func runStart(cmd *cobra.Command, args []string) {
 		if viper.GetBool(cfg.WantNoneDriverWarning) {
 			fmt.Println(`===================
 WARNING: IT IS RECOMMENDED NOT TO RUN THE NONE DRIVER ON PERSONAL WORKSTATIONS
-	The 'none' driver will run an insecure kubernetes apiserver as root that may leave the host vulnerable to CSRF attacks
-`)
+	The 'none' driver will run an insecure kubernetes apiserver as root that may leave the host vulnerable to CSRF attacks`)
 		}
 
 		if os.Getenv("CHANGE_MINIKUBE_NONE_USER") == "" {