From 01c2237ba3eee5fac31a254341f6293742a9d0f1 Mon Sep 17 00:00:00 2001 From: Szpadel Date: Wed, 4 Sep 2019 12:05:38 +0200 Subject: [PATCH] Remove redundant if branch and make sure that docker info populated --- hosts/tunnel.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hosts/tunnel.go b/hosts/tunnel.go index 1cfc51f2..09e16b25 100644 --- a/hosts/tunnel.go +++ b/hosts/tunnel.go @@ -68,10 +68,10 @@ func checkDockerVersion(ctx context.Context, h *Host, clusterVersion string) err return fmt.Errorf("Can't retrieve Docker Info: %v", err) } logrus.Debugf("Docker Info found: %#v", info) + h.DockerInfo = info if h.IgnoreDockerVersion { return nil } - h.DockerInfo = info K8sSemVer, err := util.StrToSemVer(clusterVersion) if err != nil { return fmt.Errorf("Error while parsing cluster version [%s]: %v", clusterVersion, err) @@ -84,8 +84,6 @@ func checkDockerVersion(ctx context.Context, h *Host, clusterVersion string) err if !isvalid { return fmt.Errorf("Unsupported Docker version found [%s], supported versions are %v", info.ServerVersion, metadata.K8sVersionToDockerVersions[K8sVersion]) - } else if !isvalid { - log.Warnf(ctx, "Unsupported Docker version found [%s], supported versions are %v", info.ServerVersion, metadata.K8sVersionToDockerVersions[K8sVersion]) } return nil }