From c671552a27dfdf2411dba4ceea99ebc885c9dbc9 Mon Sep 17 00:00:00 2001
From: moelsayed <m.elsayed@gmail.com>
Date: Fri, 15 Dec 2017 05:02:44 +0200
Subject: [PATCH] add ignore_docker_version

---
 cluster.yml      | 1 +
 cluster/hosts.go | 3 +++
 cmd/config.go    | 4 ++--
 hosts/hosts.go   | 9 +++++----
 hosts/tunnel.go  | 4 +++-
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/cluster.yml b/cluster.yml
index 84968c1a..5d625f14 100644
--- a/cluster.yml
+++ b/cluster.yml
@@ -20,6 +20,7 @@ network:
     flannel_cni_image: quay.io/coreos/flannel-cni:v0.2.0
 
 ssh_key_path: ~/.ssh/test
+ignore_docker_version: false
 
 nodes:
   - address: 1.1.1.1
diff --git a/cluster/hosts.go b/cluster/hosts.go
index 5789da8a..0b072d0b 100644
--- a/cluster/hosts.go
+++ b/cluster/hosts.go
@@ -40,6 +40,9 @@ func (c *Cluster) InvertIndexHosts() error {
 		if err := newHost.RegisterDialer(c.Dialer); err != nil {
 			return fmt.Errorf("Failed to register new Dialer for host [%s]: %v", host.Address, err)
 		}
+
+		newHost.IgnoreDockerVersion = c.IgnoreDockerVersion
+
 		for _, role := range host.Role {
 			logrus.Debugf("Host: " + host.Address + " has role: " + role)
 			switch role {
diff --git a/cmd/config.go b/cmd/config.go
index 65f7bd83..c8d4a715 100644
--- a/cmd/config.go
+++ b/cmd/config.go
@@ -273,8 +273,8 @@ func getServiceConfig(reader *bufio.Reader) (*v3.RKEConfigServices, error) {
 	return &servicesConfig, nil
 }
 
-func getAuthConfig(reader *bufio.Reader) (*v3.AuthConfig, error) {
-	authConfig := v3.AuthConfig{}
+func getAuthConfig(reader *bufio.Reader) (*v3.AuthnConfig, error) {
+	authConfig := v3.AuthnConfig{}
 
 	authType, err := getConfig(reader, "Authentication Strategy", "x509")
 	if err != nil {
diff --git a/hosts/hosts.go b/hosts/hosts.go
index bdbcecfa..21584e49 100644
--- a/hosts/hosts.go
+++ b/hosts/hosts.go
@@ -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 (
diff --git a/hosts/tunnel.go b/hosts/tunnel.go
index cf2ddba2..c854e4aa 100644
--- a/hosts/tunnel.go
+++ b/hosts/tunnel.go
@@ -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