From 914ca06e2c5b1e3eee79ece16b54c9aa3868001f Mon Sep 17 00:00:00 2001 From: moelsayed Date: Thu, 22 Mar 2018 03:53:34 +0200 Subject: [PATCH] Error out on unsuppored docker version instead of Warn --- cluster/hosts.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cluster/hosts.go b/cluster/hosts.go index 6375e0a3..0bce8111 100644 --- a/cluster/hosts.go +++ b/cluster/hosts.go @@ -2,6 +2,7 @@ package cluster import ( "fmt" + "strings" "context" @@ -31,6 +32,10 @@ func (c *Cluster) TunnelHosts(ctx context.Context, local bool) error { uniqueHosts := hosts.GetUniqueHostList(c.EtcdHosts, c.ControlPlaneHosts, c.WorkerHosts) for i := range uniqueHosts { if err := uniqueHosts[i].TunnelUp(ctx, c.DockerDialerFactory); err != nil { + // Unsupported Docker version is NOT a connectivity problem that we can't recover! So we bail out on it + if strings.Contains(err.Error(), "Unsupported Docker version found") { + return err + } log.Warnf(ctx, "Failed to set up SSH tunneling for host [%s]: %v", uniqueHosts[i].Address, err) c.InactiveHosts = append(c.InactiveHosts, uniqueHosts[i]) }