fix docker status

pull/6787/head
Sharif Elgamal 2020-03-17 12:28:44 -07:00
parent 84939da8e3
commit 66a6f4e906
2 changed files with 7 additions and 1 deletions

View File

@ -23,6 +23,7 @@ import (
"github.com/spf13/pflag"
"github.com/spf13/viper"
"k8s.io/minikube/pkg/minikube/config"
"k8s.io/minikube/pkg/minikube/driver"
"k8s.io/minikube/pkg/minikube/exit"
"k8s.io/minikube/pkg/minikube/node"
"k8s.io/minikube/pkg/minikube/out"
@ -43,6 +44,10 @@ var nodeAddCmd = &cobra.Command{
exit.WithError("Error getting config", err)
}
if driver.BareMetal(cc.Driver) {
out.ErrT(out.FailureType, "none driver does not support multi-node clusters")
}
name := fmt.Sprintf("m%02d", len(cc.Nodes)+1)
out.T(out.Happy, "Adding node {{.name}} to cluster {{.cluster}}", out.V{"name": name, "cluster": profile})

View File

@ -276,10 +276,11 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
port := n.Port
if driver.IsKIC(cfg.Driver) {
ip = oci.DefaultBindIPV4
port, err := oci.ForwardedPort(cfg.Driver, driver.MachineName(cfg, n), port)
p, err := oci.ForwardedPort(cfg.Driver, driver.MachineName(cfg, n), port)
if err != nil {
return errors.Wrapf(err, "get host-bind port %d for container %s", port, cfg.Name)
}
port = p
}
if n.ControlPlane {
if err := kverify.APIServerIsRunning(start, ip, port, timeout); err != nil {