From 8f91c37bba371ef0bc1ce743207fc9683d0d90c8 Mon Sep 17 00:00:00 2001
From: dlorenc <dlorenc@google.com>
Date: Tue, 12 Dec 2017 11:57:15 -0800
Subject: [PATCH] Properly support the "minikube-net" network.

---
 .../minikube_cross_build_and_upload.sh        |  2 +-
 pkg/drivers/kvm/kvm.go                        | 11 +++++-----
 pkg/minikube/cluster/cluster.go               |  2 +-
 pkg/minikube/cluster/cluster_linux.go         | 20 +++++++++++++++++++
 .../cluster/cluster_non_linux_panic.go        |  4 ++++
 5 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh
index d4db368cc4..368ae7e0a0 100755
--- a/hack/jenkins/minikube_cross_build_and_upload.sh
+++ b/hack/jenkins/minikube_cross_build_and_upload.sh
@@ -36,7 +36,7 @@ set -e
 gsutil cp gs://minikube-builds/logs/index.html gs://minikube-builds/logs/${ghprbPullId}/index.html
 
 # Exit if the cross build failed.
-if [ "$?"-ne 0]; then echo "cross build failed"; exit 1; fi
+if [ "$?"-ne 0 ]; then echo "cross build failed"; exit 1; fi
 
 # If there are ISO changes, build and upload the ISO
 # then set the default to the newly built ISO for testing
diff --git a/pkg/drivers/kvm/kvm.go b/pkg/drivers/kvm/kvm.go
index 9352ee4410..5bdc647574 100644
--- a/pkg/drivers/kvm/kvm.go
+++ b/pkg/drivers/kvm/kvm.go
@@ -34,11 +34,6 @@ import (
 	pkgdrivers "k8s.io/minikube/pkg/drivers"
 )
 
-const (
-	qemusystem                = "qemu:///system"
-	defaultPrivateNetworkName = "minikube-net"
-)
-
 type Driver struct {
 	*drivers.BaseDriver
 	*pkgdrivers.CommonDriver
@@ -72,7 +67,11 @@ type Driver struct {
 	MAC string
 }
 
-const defaultNetworkName = "minikube-net"
+const (
+	qemusystem                = "qemu:///system"
+	defaultPrivateNetworkName = "minikube-net"
+	defaultNetworkName        = "default"
+)
 
 func NewDriver(hostName, storePath string) *Driver {
 	return &Driver{
diff --git a/pkg/minikube/cluster/cluster.go b/pkg/minikube/cluster/cluster.go
index 4e55ffee48..9da1fb22e2 100644
--- a/pkg/minikube/cluster/cluster.go
+++ b/pkg/minikube/cluster/cluster.go
@@ -216,7 +216,7 @@ func createHost(api libmachine.API, config MachineConfig) (*host.Host, error) {
 		}
 		driver = createKVMHost(config)
 	case "kvm2":
-		driver = createKVMHost(config)
+		driver = createKVM2Host(config)
 	case "xhyve":
 		if viper.GetBool(cfg.ShowDriverDeprecationNotification) {
 			fmt.Fprintln(os.Stderr, `WARNING: The xhyve driver is now deprecated and support for it will be removed in a future release.
diff --git a/pkg/minikube/cluster/cluster_linux.go b/pkg/minikube/cluster/cluster_linux.go
index f0d5c967db..fb21521cef 100644
--- a/pkg/minikube/cluster/cluster_linux.go
+++ b/pkg/minikube/cluster/cluster_linux.go
@@ -62,6 +62,26 @@ func createKVMHost(config MachineConfig) *kvmDriver {
 	}
 }
 
+func createKVM2Host(config MachineConfig) *kvmDriver {
+	return &kvmDriver{
+		BaseDriver: &drivers.BaseDriver{
+			MachineName: cfg.GetMachineName(),
+			StorePath:   constants.GetMinipath(),
+			SSHUser:     "docker",
+		},
+		Memory:         config.Memory,
+		CPU:            config.CPUs,
+		Network:        config.KvmNetwork,
+		PrivateNetwork: "minikube-net",
+		Boot2DockerURL: config.Downloader.GetISOFileURI(config.MinikubeISO),
+		DiskSize:       config.DiskSize,
+		DiskPath:       filepath.Join(constants.GetMinipath(), "machines", cfg.GetMachineName(), fmt.Sprintf("%s.rawdisk", cfg.GetMachineName())),
+		ISO:            filepath.Join(constants.GetMinipath(), "machines", cfg.GetMachineName(), "boot2docker.iso"),
+		CacheMode:      "default",
+		IOMode:         "threads",
+	}
+}
+
 func detectVBoxManageCmd() string {
 	cmd := "VBoxManage"
 	if path, err := exec.LookPath(cmd); err == nil {
diff --git a/pkg/minikube/cluster/cluster_non_linux_panic.go b/pkg/minikube/cluster/cluster_non_linux_panic.go
index 8d910d77a9..f3ea6ed211 100644
--- a/pkg/minikube/cluster/cluster_non_linux_panic.go
+++ b/pkg/minikube/cluster/cluster_non_linux_panic.go
@@ -24,6 +24,10 @@ func createKVMHost(config MachineConfig) drivers.Driver {
 	panic("kvm not supported")
 }
 
+func createKVM2Host(config MachineConfig) drivers.Driver {
+	panic("kvm2 not supported")
+}
+
 func createNoneHost(config MachineConfig) drivers.Driver {
 	panic("no-vm not supported")
 }