Add CommandRunner interface

cmd/minikube/cmd/config/disable_test.go

@@ -16,47 +16,10 @@ limitations under the License.
 
 package config
 
-import (
-	"io/ioutil"
-	"testing"
-
-	"github.com/docker/machine/libmachine/drivers"
-
-	"k8s.io/minikube/pkg/minikube/assets"
-	"k8s.io/minikube/pkg/minikube/sshutil"
-	"k8s.io/minikube/pkg/minikube/tests"
-)
+import "testing"
 
 func TestDisableUnknownAddon(t *testing.T) {
 	if err := Set("InvalidAddon", "false"); err == nil {
 		t.Fatalf("Disable did not return error for unknown addon")
 	}
 }
-
-func TestDeleteAddonSSH(t *testing.T) {
-	s, _ := tests.NewSSHServer()
-	port, err := s.Start()
-	if err != nil {
-		t.Fatalf("Error starting ssh server: %s", err)
-	}
-
-	d := &tests.MockDriver{
-		Port: port,
-		BaseDriver: drivers.BaseDriver{
-			IPAddress:  "127.0.0.1",
-			SSHKeyPath: "",
-		},
-	}
-
-	dashboard := assets.Addons["dashboard"]
-	if err := deleteAddonSSH(dashboard, d); err != nil {
-		t.Fatalf("Unexpected error %s deleting addon", err)
-	}
-	// check command(s) were run
-	for _, addon := range dashboard.Assets {
-		expected, _ := ioutil.ReadFile(addon.GetAssetName())
-		if _, ok := s.Commands[sshutil.GetDeleteFileCommand(addon)]; !ok {
-			t.Fatalf("Error: Expected delete addon ssh command to be run: %s.", expected)
-		}
-	}
-}

cmd/minikube/cmd/config/enable_test.go

@@ -16,49 +16,10 @@ limitations under the License.
 
 package config
 
-import (
-	"bytes"
-	"io/ioutil"
-	"testing"
-
-	"github.com/docker/machine/libmachine/drivers"
-
-	"k8s.io/minikube/pkg/minikube/assets"
-	"k8s.io/minikube/pkg/minikube/tests"
-)
+import "testing"
 
 func TestEnableUnknownAddon(t *testing.T) {
 	if err := Set("InvalidAddon", "false"); err == nil {
 		t.Fatalf("Enable did not return error for unknown addon")
 	}
 }
-
-func TestTransferAddonSSH(t *testing.T) {
-	s, _ := tests.NewSSHServer()
-	port, err := s.Start()
-	if err != nil {
-		t.Fatalf("Error starting ssh server: %s", err)
-	}
-
-	d := &tests.MockDriver{
-		Port: port,
-		BaseDriver: drivers.BaseDriver{
-			IPAddress:  "127.0.0.1",
-			SSHKeyPath: "",
-		},
-	}
-
-	dashboard := assets.Addons["dashboard"]
-	if err := transferAddonSSH(dashboard, d); err != nil {
-		t.Fatalf("Unexpected error %s transferring addon", err)
-	}
-	// check contents
-	for _, addon := range dashboard.Assets {
-		expected, _ := ioutil.ReadFile(addon.GetAssetName())
-		transferred := s.Transfers.Bytes()
-		//test that custom addons are transferred properly
-		if !bytes.Contains(transferred, expected) {
-			t.Fatalf("Expected transfers to contain addon with content: %s. It was: %s", expected, transferred)
-		}
-	}
-}

cmd/minikube/cmd/config/util.go

@@ -19,16 +19,13 @@ package config
 import (
 	"fmt"
 	"os"
-	"path/filepath"
 	"strconv"
 
-	"github.com/docker/machine/libmachine/drivers"
 	"github.com/pkg/errors"
 	"k8s.io/minikube/pkg/minikube/assets"
 	"k8s.io/minikube/pkg/minikube/cluster"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/machine"
-	"k8s.io/minikube/pkg/minikube/sshutil"
 	"k8s.io/minikube/pkg/minikube/storageclass"
 )
 
@@ -102,60 +99,26 @@ func EnableOrDisableAddon(name string, val string) error {
 		return err
 	}
 	host, err := cluster.CheckIfApiExistsAndLoad(api)
-	if enable {
-		if err = transferAddon(addon, host.Driver); err != nil {
-			return errors.Wrapf(err, "Error transferring addon %s to VM", name)
-		}
-	} else {
-		if err = deleteAddon(addon, host.Driver); err != nil {
-			return errors.Wrapf(err, "Error deleting addon %s from VM", name)
-		}
-	}
-	return nil
-}
-
-func deleteAddonSSH(addon *assets.Addon, d drivers.Driver) error {
-	client, err := sshutil.NewSSHClient(d)
 	if err != nil {
-		return err
+		return errors.Wrap(err, "getting host")
 	}
-	if err := sshutil.DeleteAddon(addon, client); err != nil {
-		return err
+	cmd, err := machine.GetCommandRunner(host)
+	if err != nil {
+		return errors.Wrap(err, "getting command runner")
 	}
-	return nil
-}
-
-func deleteAddon(addon *assets.Addon, d drivers.Driver) error {
-	if d.DriverName() == "none" {
-		if err := deleteAddonLocal(addon, d); err != nil {
-			return err
+	if enable {
+		for _, addon := range addon.Assets {
+			if err := cmd.Copy(addon); err != nil {
+				return errors.Wrapf(err, "error enabling addon %s: %s", addon.AssetName)
+			}
 		}
 	} else {
-		if err := deleteAddonSSH(addon, d); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func deleteAddonLocal(addon *assets.Addon, d drivers.Driver) error {
-	var err error
-	for _, f := range addon.Assets {
-		if err = os.Remove(filepath.Join(f.GetTargetDir(), f.GetTargetName())); err != nil {
-			return err
+		for _, addon := range addon.Assets {
+			if err := cmd.Remove(addon); err != nil {
+				return errors.Wrapf(err, "error disabling addon %s: %s", addon.AssetName)
+			}
 		}
 	}
-	return err
-}
-
-func transferAddonSSH(addon *assets.Addon, d drivers.Driver) error {
-	client, err := sshutil.NewSSHClient(d)
-	if err != nil {
-		return err
-	}
-	if err := sshutil.TransferAddon(addon, client); err != nil {
-		return err
-	}
 	return nil
 }
 
@@ -174,26 +137,3 @@ func EnableOrDisableDefaultStorageClass(name, val string) error {
 	}
 	return EnableOrDisableAddon(name, val)
 }
-
-func transferAddon(addon *assets.Addon, d drivers.Driver) error {
-	if d.DriverName() == "none" {
-		if err := transferAddonLocal(addon, d); err != nil {
-			return err
-		}
-	} else {
-		if err := transferAddonSSH(addon, d); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func transferAddonLocal(addon *assets.Addon, d drivers.Driver) error {
-	var err error
-	for _, f := range addon.Assets {
-		if err = assets.CopyFileLocal(f); err != nil {
-			return err
-		}
-	}
-	return err
-}

cmd/minikube/cmd/logs.go

@@ -21,9 +21,11 @@ import (
 	"log"
 	"os"
 
+	"github.com/golang/glog"
 	"github.com/spf13/cobra"
 	cmdUtil "k8s.io/minikube/cmd/util"
 	"k8s.io/minikube/pkg/minikube/cluster"
+	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/machine"
 )
 
@@ -43,7 +45,15 @@ var logsCmd = &cobra.Command{
 			os.Exit(1)
 		}
 		defer api.Close()
-		s, err := cluster.GetHostLogs(api, follow)
+		h, err := api.Load(config.GetMachineName())
+		if err != nil {
+			glog.Errorln("Error getting host")
+		}
+		cmdRunner, err := machine.GetCommandRunner(h)
+		if err != nil {
+			glog.Errorln("Error getting command runner interface")
+		}
+		s, err := cluster.GetHostLogs(cmdRunner, follow)
 		if err != nil {
 			log.Println("Error getting machine logs:", err)
 			cmdUtil.MaybeReportErrorAndExit(err)

cmd/minikube/cmd/start.go

@@ -192,21 +192,26 @@ func runStart(cmd *cobra.Command, args []string) {
 		glog.Errorln("Error saving profile cluster configuration: ", err)
 	}
 
+	cmdRunner, err := machine.GetCommandRunner(host)
+	if err != nil {
+		glog.Errorln("Error getting command runner interface")
+	}
+
 	fmt.Println("Moving files into cluster...")
-	if err := cluster.UpdateCluster(host.Driver, kubernetesConfig); err != nil {
+	if err := cluster.UpdateCluster(cmdRunner, kubernetesConfig); err != nil {
 		glog.Errorln("Error updating cluster: ", err)
 		cmdUtil.MaybeReportErrorAndExit(err)
 	}
 
 	fmt.Println("Setting up certs...")
-	if err := cluster.SetupCerts(host.Driver, kubernetesConfig.APIServerName, kubernetesConfig.DNSDomain); err != nil {
+	if err := cluster.SetupCerts(cmdRunner, kubernetesConfig); err != nil {
 		glog.Errorln("Error configuring authentication: ", err)
 		cmdUtil.MaybeReportErrorAndExit(err)
 	}
 
 	fmt.Println("Starting cluster components...")
 
-	if err := cluster.StartCluster(api, kubernetesConfig); err != nil {
+	if err := cluster.StartCluster(cmdRunner, kubernetesConfig); err != nil {
 		glog.Errorln("Error starting cluster: ", err)
 		cmdUtil.MaybeReportErrorAndExit(err)
 	}

cmd/minikube/cmd/status.go

@@ -62,7 +62,16 @@ var statusCmd = &cobra.Command{
 		cs := state.None.String()
 		ks := state.None.String()
 		if ms == state.Running.String() {
-			cs, err = cluster.GetLocalkubeStatus(api)
+			h, err := api.Load(config.GetMachineName())
+			if err != nil {
+				glog.Exitln("Error getting host")
+			}
+			cmdRunner, err := machine.GetCommandRunner(h)
+			if err != nil {
+				glog.Errorln("Error getting command runner interface")
+				cmdUtil.MaybeReportErrorAndExit(err)
+			}
+			cs, err = cluster.GetLocalkubeStatus(cmdRunner)
 			if err != nil {
 				glog.Errorln("Error localkube status:", err)
 				cmdUtil.MaybeReportErrorAndExit(err)