Merge pull request #3650 from bassam/pr-fix-parallels

Fix parallels support after #953
kubernetes · Feb 14, 2019 · c29ef66 · c29ef66
2 parents b2a096c + 104f7de
commit c29ef66
Show file tree

Hide file tree

Showing 11 changed files with 1,796 additions and 1 deletion.
diff --git a/pkg/minikube/cluster/default_drivers.go b/pkg/minikube/cluster/default_drivers.go
@@ -22,6 +22,7 @@ import (
 	_ "k8s.io/minikube/pkg/minikube/drivers/kvm"
 	_ "k8s.io/minikube/pkg/minikube/drivers/kvm2"
 	_ "k8s.io/minikube/pkg/minikube/drivers/none"
+	_ "k8s.io/minikube/pkg/minikube/drivers/parallels"
 	_ "k8s.io/minikube/pkg/minikube/drivers/virtualbox"
 	_ "k8s.io/minikube/pkg/minikube/drivers/vmware"
 	_ "k8s.io/minikube/pkg/minikube/drivers/vmwarefusion"

diff --git a/pkg/minikube/drivers/parallels/driver.go b/pkg/minikube/drivers/parallels/driver.go
@@ -43,6 +43,5 @@ func createParallelsHost(config cfg.MachineConfig) interface{} {
 	d.Memory = config.Memory
 	d.CPU = config.CPUs
 	d.DiskSize = config.DiskSize
-	d.ISO = d.ResolveStorePath("boot2docker.iso")
 	return d
 }
diff --git a/vendor/github.com/Parallels/docker-machine-parallels/LICENSE b/vendor/github.com/Parallels/docker-machine-parallels/LICENSE
diff --git a/vendor/github.com/Parallels/docker-machine-parallels/parallels.go b/vendor/github.com/Parallels/docker-machine-parallels/parallels.go