Merge branch 'master' into dead-mount

Makefile

@@ -23,7 +23,8 @@ BUILDROOT_BRANCH ?= 2018.05
 REGISTRY?=gcr.io/k8s-minikube
 
 HYPERKIT_BUILD_IMAGE 	?= karalabe/xgo-1.10.x
-BUILD_IMAGE 	?= k8s.gcr.io/kube-cross:v1.10.1-1
+# NOTE: "latest" as of 2018-12-04. kube-cross images aren't updated as often as Kubernetes
+BUILD_IMAGE 	?= k8s.gcr.io/kube-cross:v1.11.1-1
 ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image
 
 ISO_VERSION ?= v0.30.0

hack/jenkins/common.sh

@@ -157,7 +157,7 @@ kprocs=$(pgrep kubectl || true)
 if [[ "${kprocs}" != "" ]]; then
   echo "error: killing hung kubectl processes ..."
   ps -f -p ${kprocs} || true
-  kill ${kprocs} || true
+  ${SUDO_PREFIX} kill ${kprocs} || true
 fi
 
 mkdir -p "${TEST_HOME}"

hack/jenkins/linux_integration_tests_none.sh

@@ -36,9 +36,11 @@ export KUBECONFIG="/root/.kube/config"
 
 # "none" driver specific cleanup from previous runs.
 # kubeadm
-sudo kubeadm reset || true
+sudo kubeadm reset -f || true
 # Cleanup data directory
 sudo rm -rf /data/*
+# Cleanup old Kubernetes configs
+sudo rm -rf /etc/kubernetes/*
 # Stop any leftover kubelets
 systemctl is-active --quiet kubelet \
   && echo "stopping kubelet" \

pkg/minikube/constants/constants.go

@@ -22,13 +22,13 @@ import (
 	"path/filepath"
 	"runtime"
 	"strings"
+	"time"
 
 	"github.com/blang/semver"
 	"github.com/golang/glog"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/util/homedir"
 	minikubeVersion "k8s.io/minikube/pkg/version"
-	"time"
 )
 
 // APIServerPort is the port that the API server should listen on.
@@ -125,7 +125,7 @@ const (
 var DefaultIsoUrl = fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s.iso", minikubeVersion.GetIsoPath(), minikubeVersion.GetIsoVersion())
 var DefaultIsoShaUrl = DefaultIsoUrl + ShaSuffix
 
-var DefaultKubernetesVersion = "v1.10.0"
+var DefaultKubernetesVersion = "v1.12.3"
 
 var ConfigFilePath = MakeMiniPath("config")
 var ConfigFile = MakeMiniPath("config", "config.json")