rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-17 15:40:07 +00:00
Code Issues Releases Wiki Activity

Remove redundant if branch and make sure that docker info populated

Browse Source
This commit is contained in:
Szpadel
2019-09-04 12:05:38 +02:00
committed by Alena Prokharchyk
parent 2291a1b734
commit 01c2237ba3
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hosts/tunnel.go
View File

@@ -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
}