rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-16 23:20:56 +00:00
Code Issues Releases Wiki Activity

add ignore_docker_version

Browse Source
This commit is contained in:
moelsayed
2017-12-15 05:02:44 +02:00
parent e30d90f5c4
commit c671552a27
5 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
hosts/hosts.go
View File

@@ -15,10 +15,11 @@ import (
type Host struct {
v3.RKEConfigNode
DClient *client.Client
Dialer Dialer
IsControl bool
IsWorker bool
DClient *client.Client
Dialer Dialer
IsControl bool
IsWorker bool
IgnoreDockerVersion bool
}
const (

4
hosts/tunnel.go
View File

@@ -46,8 +46,10 @@ func (h *Host) TunnelUp() error {
return fmt.Errorf("Error while determining supported Docker version [%s]: %v", info.ServerVersion, err)
}
if !isvalid {
if !isvalid && !h.IgnoreDockerVersion {
return fmt.Errorf("Unsupported Docker version found [%s], supported versions are %v", info.ServerVersion, docker.K8sDockerVersions[K8sVersion])
} else if !isvalid {
logrus.Warnf("Unsupported Docker version found [%s], supported versions are %v", info.ServerVersion, docker.K8sDockerVersions[K8sVersion])
}
return nil