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

Fix tests

pull/5397/head
Thomas Stromberg 2019-09-18 13:46:10 -07:00
parent 846dd306f3
commit 197039c23d
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/minikube/cmd/start.go
View File

@ -292,9 +292,15 @@ func runStart(cmd *cobra.Command, args []string) {
validateFlags(driver)
validateUser(driver)
if err := drivers.InstallOrUpdate(driver, viper.GetBool(interactive)); err != nil {
glog.Errorf("error: %v", err)
out.WarningT("Unable to update {{.driver}} driver: {{.error}}", out.V{"driver": driver, "error": err})
v, err := version.GetSemverVersion()
if err != nil {
out.WarningT("Error parsing minikube version: {{.error}}", out.V{"error": err})
} else {
if err := drivers.InstallOrUpdate(driver, constants.MakeMiniPath("bin"), v, viper.GetBool(interactive)); err != nil {
glog.Errorf("error: %v", err)
out.WarningT("Unable to update {{.driver}} driver: {{.error}}", out.V{"driver": driver, "error": err})
}
}
k8sVersion, isUpgrade := getKubernetesVersion(oldConfig)

10
pkg/drivers/drivers.go
View File

@ -149,22 +149,16 @@ func fixMachinePermissions(path string) error {
}
// InstallOrUpdate downloads driver if it is not present, or updates it if there's a newer version
func InstallOrUpdate(driver string, interactive bool) error {
func InstallOrUpdate(driver string, directory string, v semver.Version, interactive bool) error {
if driver != constants.DriverKvm2 && driver != constants.DriverHyperkit {
return nil
}
v, err := version.GetSemverVersion()
if err != nil {
out.WarningT("Error parsing minikube version: {{.error}}", out.V{"error": err})
return err
}
executable := fmt.Sprintf("docker-machine-driver-%s", driver)
path, err := validateDriver(executable, v)
if err != nil {
glog.Warningf("%s: %v", driver, executable)
path = filepath.Join(constants.MakeMiniPath("bin"), executable)
path = filepath.Join(directory, executable)
derr := download(executable, path, v)
if derr != nil {
return derr

4
test/integration/driver_install_or_update_test.go
View File

@ -84,7 +84,7 @@ func TestKVMDriverInstallOrUpdate(t *testing.T) {
t.Fatalf("Expected new semver. test: %v, got: %v", tc.name, err)
}
err = drivers.InstallOrUpdate("docker-machine-driver-kvm2", dir, newerVersion)
err = drivers.InstallOrUpdate("docker-machine-driver-kvm2", dir, newerVersion, true)
if err != nil {
t.Fatalf("Failed to update driver to %v. test: %s, got: %v", newerVersion, tc.name, err)
}
@ -147,7 +147,7 @@ func TestHyperKitDriverInstallOrUpdate(t *testing.T) {
t.Fatalf("Expected new semver. test: %v, got: %v", tc.name, err)
}
err = drivers.InstallOrUpdate("docker-machine-driver-hyperkit", dir, newerVersion)
err = drivers.InstallOrUpdate("docker-machine-driver-hyperkit", dir, newerVersion, true)
if err != nil {
t.Fatalf("Failed to update driver to %v. test: %s, got: %v", newerVersion, tc.name, err)
}