kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add driver registration back

pull/5658/head
tstromberg 2019-10-18 15:32:46 -07:00
parent cedab9e0fb
commit 440d0e85e6
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/minikube/cluster/cluster.go
View File

@ -43,6 +43,7 @@ import (
"github.com/shirou/gopsutil/disk"
"github.com/shirou/gopsutil/mem"
"github.com/spf13/viper"
cfg "k8s.io/minikube/pkg/minikube/config"
"k8s.io/minikube/pkg/minikube/constants"
"k8s.io/minikube/pkg/minikube/driver"
@ -50,6 +51,7 @@ import (
"k8s.io/minikube/pkg/minikube/localpath"
"k8s.io/minikube/pkg/minikube/out"
"k8s.io/minikube/pkg/minikube/registry"
_ "k8s.io/minikube/pkg/minikube/registry/drvs"
pkgutil "k8s.io/minikube/pkg/util"
"k8s.io/minikube/pkg/util/retry"
)
@ -432,7 +434,7 @@ func createHost(api libmachine.API, config cfg.MachineConfig) (*host.Host, error
def, err := registry.Driver(config.VMDriver)
if err != nil {
if err == registry.ErrDriverNotFound {
return nil, fmt.Errorf("unsupported driver: %s", config.VMDriver)
return nil, fmt.Errorf("unsupported/missing driver: %s", config.VMDriver)
}
return nil, errors.Wrap(err, "error getting driver")
}

2
pkg/minikube/machine/client.go
View File

@ -274,7 +274,7 @@ func registerDriver(drvName string) {
def, err := registry.Driver(drvName)
if err != nil {
if err == registry.ErrDriverNotFound {
exit.UsageT("unsupported driver: {{.name}}", out.V{"name": drvName})
exit.UsageT("unsupported or missing driver: {{.name}}", out.V{"name": drvName})
}
exit.WithError("error getting driver", err)
}