From 97c9fa3cb98497460cc8aaed2ae3c1514d6055c6 Mon Sep 17 00:00:00 2001
From: xichengliudui <liuduidui@beyondcent.com>
Date: Mon, 17 Sep 2018 04:44:48 -0400
Subject: [PATCH] Upgrade kubeadm's version of docker support

---
 cmd/kubeadm/app/util/system/docker_validator.go      | 2 +-
 cmd/kubeadm/app/util/system/docker_validator_test.go | 9 +++++++--
 cmd/kubeadm/app/util/system/types_unix.go            | 2 +-
 cmd/kubeadm/app/util/system/types_windows.go         | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/cmd/kubeadm/app/util/system/docker_validator.go b/cmd/kubeadm/app/util/system/docker_validator.go
index d6895fa90d4..69b84dc6601 100644
--- a/cmd/kubeadm/app/util/system/docker_validator.go
+++ b/cmd/kubeadm/app/util/system/docker_validator.go
@@ -38,7 +38,7 @@ func (d *DockerValidator) Name() string {
 
 const (
 	dockerConfigPrefix        = "DOCKER_"
-	maxDockerValidatedVersion = "17.03"
+	maxDockerValidatedVersion = "18.06"
 )
 
 // TODO(random-liu): Add more validating items.
diff --git a/cmd/kubeadm/app/util/system/docker_validator_test.go b/cmd/kubeadm/app/util/system/docker_validator_test.go
index 3ee315ef0db..6ab88550d72 100644
--- a/cmd/kubeadm/app/util/system/docker_validator_test.go
+++ b/cmd/kubeadm/app/util/system/docker_validator_test.go
@@ -28,7 +28,7 @@ func TestValidateDockerInfo(t *testing.T) {
 		Reporter: DefaultReporter,
 	}
 	spec := &DockerSpec{
-		Version:     []string{`1\.1[1-3]\..*`, `17\.03\..*`}, // Requires [1.11, 17.03].
+		Version:     []string{`1\.1[1-3]\..*`, `18\.06\..*`}, // Requires [1.11, 18.06].
 		GraphDriver: []string{"driver_1", "driver_2"},
 	}
 	for _, test := range []struct {
@@ -69,7 +69,12 @@ func TestValidateDockerInfo(t *testing.T) {
 		{
 			info: types.Info{Driver: "driver_2", ServerVersion: "17.06.0-ce"},
 			err:  false,
-			warn: true,
+			warn: false,
+		},
+		{
+			info: types.Info{Driver: "driver_2", ServerVersion: "18.06.0-ce"},
+			err:  false,
+			warn: false,
 		},
 	} {
 		warn, err := v.validateDockerInfo(spec, test.info)
diff --git a/cmd/kubeadm/app/util/system/types_unix.go b/cmd/kubeadm/app/util/system/types_unix.go
index be4b6b2606e..f1b6350f7cf 100644
--- a/cmd/kubeadm/app/util/system/types_unix.go
+++ b/cmd/kubeadm/app/util/system/types_unix.go
@@ -62,7 +62,7 @@ var DefaultSysSpec = SysSpec{
 	Cgroups: []string{"cpu", "cpuacct", "cpuset", "devices", "freezer", "memory"},
 	RuntimeSpec: RuntimeSpec{
 		DockerSpec: &DockerSpec{
-			Version:     []string{`1\.1[1-3]\..*`, `17\.03\..*`}, // Requires [1.11, 17.03]
+			Version:     []string{`1\.1[1-3]\..*`, `18\.06\..*`}, // Requires [1.11, 18.06]
 			GraphDriver: []string{"aufs", "overlay", "overlay2", "devicemapper", "zfs"},
 		},
 	},
diff --git a/cmd/kubeadm/app/util/system/types_windows.go b/cmd/kubeadm/app/util/system/types_windows.go
index 5047013e6a4..fb85049cdd7 100644
--- a/cmd/kubeadm/app/util/system/types_windows.go
+++ b/cmd/kubeadm/app/util/system/types_windows.go
@@ -38,7 +38,7 @@ var DefaultSysSpec = SysSpec{
 	Cgroups: []string{},
 	RuntimeSpec: RuntimeSpec{
 		DockerSpec: &DockerSpec{
-			Version:     []string{`17\.03\..*`}, //Requires [17.03] or later
+			Version:     []string{`18\.06\..*`}, //Requires [18.06] or later
 			GraphDriver: []string{"windowsfilter"},
 		},
 	},