From bae164a2176db228e4ed4b9cf48b1d3f595a15e2 Mon Sep 17 00:00:00 2001 From: wujeff Date: Wed, 28 Nov 2018 18:31:37 +0800 Subject: [PATCH 1/2] Tell user given driver has been igored if exising VM has a different driver --- pkg/minikube/cluster/cluster.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/minikube/cluster/cluster.go b/pkg/minikube/cluster/cluster.go index 08d9f16d13c6..a3b1b8b2eb2f 100644 --- a/pkg/minikube/cluster/cluster.go +++ b/pkg/minikube/cluster/cluster.go @@ -78,6 +78,10 @@ func StartHost(api libmachine.API, config cfg.MachineConfig) (*host.Host, error) return nil, errors.Wrap(err, "Error loading existing host. Please try running [minikube delete], then run [minikube start] again.") } + if h.Driver.DriverName() != "none" && h.Driver.DriverName() != config.VMDriver { + fmt.Printf("Skipping %s driver, existing host has %s driver.\n", config.VMDriver, h.Driver.DriverName()) + } + s, err := h.Driver.GetState() glog.Infoln("Machine state: ", s) if err != nil { From 8905dba07b95577812ee31222c50a528e00b7520 Mon Sep 17 00:00:00 2001 From: Jeff Wu Date: Wed, 5 Dec 2018 13:12:53 +0800 Subject: [PATCH 2/2] Correcting for PR comments --- pkg/minikube/cluster/cluster.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/cluster/cluster.go b/pkg/minikube/cluster/cluster.go index a3b1b8b2eb2f..88acf9372f48 100644 --- a/pkg/minikube/cluster/cluster.go +++ b/pkg/minikube/cluster/cluster.go @@ -78,7 +78,7 @@ func StartHost(api libmachine.API, config cfg.MachineConfig) (*host.Host, error) return nil, errors.Wrap(err, "Error loading existing host. Please try running [minikube delete], then run [minikube start] again.") } - if h.Driver.DriverName() != "none" && h.Driver.DriverName() != config.VMDriver { + if h.Driver.DriverName() != config.VMDriver { fmt.Printf("Skipping %s driver, existing host has %s driver.\n", config.VMDriver, h.Driver.DriverName()) }