diff --git a/cmd/minikube/cmd/config/config_test.go b/cmd/minikube/cmd/config/config_test.go index 098f89418d..07388fef4e 100644 --- a/cmd/minikube/cmd/config/config_test.go +++ b/cmd/minikube/cmd/config/config_test.go @@ -49,7 +49,7 @@ var configTestCases = []configTestCase{ "vm-driver": "kvm2" }`, config: map[string]interface{}{ - "vm-driver": constants.DriverKvmOld, + "vm-driver": constants.DriverKvm2, "cpus": 4, "disk-size": "20g", "v": 5, diff --git a/cmd/minikube/cmd/config/util_test.go b/cmd/minikube/cmd/config/util_test.go index 8e3e78ce11..0f0cf189c8 100644 --- a/cmd/minikube/cmd/config/util_test.go +++ b/cmd/minikube/cmd/config/util_test.go @@ -25,7 +25,7 @@ import ( ) var minikubeConfig = pkgConfig.MinikubeConfig{ - "vm-driver": constants.DriverKvmOld, + "vm-driver": constants.DriverKvm2, "cpus": 12, "show-libmachine-logs": true, } diff --git a/pkg/minikube/cluster/cluster.go b/pkg/minikube/cluster/cluster.go index 4ca0a87b4b..0b9291f1a3 100644 --- a/pkg/minikube/cluster/cluster.go +++ b/pkg/minikube/cluster/cluster.go @@ -318,21 +318,15 @@ func engineOptions(config cfg.MachineConfig) *engine.Options { return &o } -func preCreateHost(config *cfg.MachineConfig) { - switch config.VMDriver { - case constants.DriverVmwareFusion: - if viper.GetBool(cfg.ShowDriverDeprecationNotification) { - console.Warning(`The vmwarefusion driver is deprecated and support for it will be removed in a future release. - Please consider switching to the new vmware unified driver, which is intended to replace the vmwarefusion driver. - See https://github.com/kubernetes/minikube/blob/master/docs/drivers.md#vmware-unified-driver for more information. - To disable this message, run [minikube config set ShowDriverDeprecationNotification false]`) - } - } -} - func createHost(api libmachine.API, config cfg.MachineConfig) (*host.Host, error) { - preCreateHost(&config) console.OutStyle(console.StartingVM, "Creating %s VM (CPUs=%d, Memory=%dMB, Disk=%dMB) ...", config.VMDriver, config.CPUs, config.Memory, config.DiskSize) + if config.VMDriver == constants.DriverVmwareFusion && viper.GetBool(cfg.ShowDriverDeprecationNotification) { + console.Warning(`The vmwarefusion driver is deprecated and support for it will be removed in a future release. + Please consider switching to the new vmware unified driver, which is intended to replace the vmwarefusion driver. + See https://github.com/kubernetes/minikube/blob/master/docs/drivers.md#vmware-unified-driver for more information. + To disable this message, run [minikube config set ShowDriverDeprecationNotification false]`) + } + def, err := registry.Driver(config.VMDriver) if err != nil { if err == registry.ErrDriverNotFound { diff --git a/pkg/minikube/config/config_test.go b/pkg/minikube/config/config_test.go index ecc13c5ce7..5384a8b41a 100644 --- a/pkg/minikube/config/config_test.go +++ b/pkg/minikube/config/config_test.go @@ -49,7 +49,7 @@ var configTestCases = []configTestCase{ "vm-driver": "kvm" }`, config: map[string]interface{}{ - "vm-driver": constants.DriverKvmOld, + "vm-driver": constants.DriverKvm2, "cpus": 4, "disk-size": "20g", "v": 5,