Commit c425298f authored by galal-hussein's avatar galal-hussein
Browse files

revert back to ignore docker version

parent c2f4ada9
Showing with 11 additions and 11 deletions
+11 -11
......@@ -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)
......
......@@ -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 (
......
......@@ -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])
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment