diff --git a/Makefile b/Makefile index a1bb0dbaa396..7cd71696ae11 100644 --- a/Makefile +++ b/Makefile @@ -278,15 +278,15 @@ release-iso: minikube_iso checksum gsutil cp out/minikube.iso gs://$(ISO_BUCKET)/minikube-$(ISO_VERSION).iso gsutil cp out/minikube.iso.sha256 gs://$(ISO_BUCKET)/minikube-$(ISO_VERSION).iso.sha256 -out/docker-machine-driver-kvm: $(KVM_DRIVER_FILES) +out/docker-machine-driver-kvm2: $(KVM_DRIVER_FILES) go build \ -installsuffix "static" \ -ldflags "-X k8s.io/minikube/pkg/drivers/kvm/version.VERSION=$(VERSION)" \ -tags libvirt.1.2.2 \ - -o $(BUILD_DIR)/docker-machine-driver-kvm \ + -o $(BUILD_DIR)/docker-machine-driver-kvm2 \ k8s.io/minikube/cmd/drivers/kvm chmod +X $@ .PHONY: install-kvm -install-kvm: out/docker-machine-driver-kvm - cp out/docker-machine-driver-kvm $(GOBIN)/docker-machine-driver-kvm +install-kvm: out/docker-machine-driver-kvm2 + cp out/docker-machine-driver-kvm2 $(GOBIN)/docker-machine-driver-kvm2 diff --git a/hack/jenkins/linux_integration_tests_kvm_alt.sh b/hack/jenkins/linux_integration_tests_kvm_alt.sh index 84092780506e..e150088603bf 100644 --- a/hack/jenkins/linux_integration_tests_kvm_alt.sh +++ b/hack/jenkins/linux_integration_tests_kvm_alt.sh @@ -26,7 +26,7 @@ set -e OS_ARCH="linux-amd64" -VM_DRIVER="kvm" +VM_DRIVER="kvm2" JOB_NAME="Linux-KVM-Alt" # Download files and set permissions diff --git a/pkg/minikube/cluster/cluster.go b/pkg/minikube/cluster/cluster.go index cf1ddf43b33b..843da42e36a1 100644 --- a/pkg/minikube/cluster/cluster.go +++ b/pkg/minikube/cluster/cluster.go @@ -338,7 +338,7 @@ func createHost(api libmachine.API, config MachineConfig) (*host.Host, error) { driver = createVirtualboxHost(config) case "vmwarefusion": driver = createVMwareFusionHost(config) - case "kvm": + case "kvm", "kvm2": driver = createKVMHost(config) case "xhyve": driver = createXhyveHost(config) diff --git a/pkg/minikube/constants/constants_linux.go b/pkg/minikube/constants/constants_linux.go index 7c8bb1c7c28f..30e020310510 100644 --- a/pkg/minikube/constants/constants_linux.go +++ b/pkg/minikube/constants/constants_linux.go @@ -25,6 +25,7 @@ import ( var SupportedVMDrivers = [...]string{ "virtualbox", "kvm", + "kvm2", "none", }