rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-04-28 03:31:24 +00:00
Code Issues Releases Wiki Activity

revert back to ignore docker version

Browse Source
This commit is contained in:
galal-hussein 2018-01-22 21:31:03 +02:00
parent c2f4ada95e
commit c425298f69
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/hosts.go
View File

@ -47,7 +47,7 @@ func (c *Cluster) InvertIndexHosts() error {
RKEConfigNode: host,
}
newHost.EnforceDockerVersion = c.EnforceDockerVersion
newHost.IgnoreDockerVersion = c.IgnoreDockerVersion
for _, role := range host.Role {
logrus.Debugf("Host: " + host.Address + " has role: " + role)

18
hosts/hosts.go
View File

@ -16,15 +16,15 @@ import (
type Host struct {
v3.RKEConfigNode
DClient *client.Client
LocalConnPort int
IsControl bool
IsWorker bool
IsEtcd bool
EnforceDockerVersion bool
ToAddEtcdMember bool
ExistingEtcdCluster bool
SavedKeyPhrase string
DClient *client.Client
LocalConnPort int
IsControl bool
IsWorker bool
IsEtcd bool
IgnoreDockerVersion bool
ToAddEtcdMember bool
ExistingEtcdCluster bool
SavedKeyPhrase string
}
const (

2
hosts/tunnel.go
View File

@ -65,7 +65,7 @@ func checkDockerVersion(ctx context.Context, h *Host) error {
return fmt.Errorf("Error while determining supported Docker version [%s]: %v", info.ServerVersion, err)
}
if !isvalid && h.EnforceDockerVersion {
if !isvalid && !h.IgnoreDockerVersion {
return fmt.Errorf("Unsupported Docker version found [%s], supported versions are %v", info.ServerVersion, docker.K8sDockerVersions[K8sVersion])
} else if !isvalid {
log.Warnf(ctx, "Unsupported Docker version found [%s], supported versions are %v", info.ServerVersion, docker.K8sDockerVersions[K8sVersion])