From 0119d725c6bc6f4b60ded96a363d5cc43f08bfdb Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Tue, 7 Apr 2020 15:51:29 -0700 Subject: [PATCH 1/2] Use SSH runner once SSH is set up in kic This change shaves off 1.5 seconds on setupKubeadm, and shaves off ~4 seconds in total. --- pkg/minikube/machine/client.go | 5 +++++ pkg/minikube/node/start.go | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/pkg/minikube/machine/client.go b/pkg/minikube/machine/client.go index 06c422b2a8..49f0a901be 100644 --- a/pkg/minikube/machine/client.go +++ b/pkg/minikube/machine/client.go @@ -157,6 +157,11 @@ func CommandRunner(h *host.Host) (command.Runner, error) { if driver.IsKIC(h.Driver.DriverName()) { return command.NewKICRunner(h.Name, h.Driver.DriverName()), nil } + return SSHRunner(h) +} + +// SSHRunner returns an SSH runner for the host +func SSHRunner(h *host.Host) (command.Runner, error) { client, err := sshutil.NewSSHClient(h.Driver) if err != nil { return nil, errors.Wrap(err, "getting ssh client for bootstrapper") diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go index 9f4dbbd0bf..7fcb0e5351 100644 --- a/pkg/minikube/node/start.go +++ b/pkg/minikube/node/start.go @@ -106,6 +106,17 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo cr := configureRuntimes(mRunner, cc.Driver, cc.KubernetesConfig, sv) showVersionInfo(n.KubernetesVersion, cr) + // ssh should be set up by now + // switch to using ssh runner since it is faster + if driver.IsKIC(cc.Driver) { + sshRunner, err := machine.SSHRunner(host) + if err != nil { + glog.Infof("error getting ssh runner, will use slower command runner: %v", err) + } else { + mRunner = sshRunner + } + } + var bs bootstrapper.Bootstrapper var kcs *kubeconfig.Settings if apiServer { From 4f42dc3a5ba87c3068dc53a0f647611044232a10 Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Tue, 7 Apr 2020 16:46:41 -0700 Subject: [PATCH 2/2] logs --- pkg/minikube/node/start.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go index 7fcb0e5351..427c717900 100644 --- a/pkg/minikube/node/start.go +++ b/pkg/minikube/node/start.go @@ -111,8 +111,9 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo if driver.IsKIC(cc.Driver) { sshRunner, err := machine.SSHRunner(host) if err != nil { - glog.Infof("error getting ssh runner, will use slower command runner: %v", err) + glog.Infof("error getting ssh runner: %v", err) } else { + glog.Infof("Using ssh runner for kic...") mRunner = sshRunner } }