From 945889988b4013b36cb5428a2de8a493e43a7f25 Mon Sep 17 00:00:00 2001 From: xichengliudui Date: Fri, 25 Jan 2019 12:54:36 -0500 Subject: [PATCH] Update docker support for k8s update pull request update pull request update pull request update pull request --- cmd/kubeadm/app/util/system/docker_validator_test.go | 2 +- cmd/kubeadm/app/util/system/types_unix.go | 2 +- cmd/kubeadm/app/util/system/types_windows.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/kubeadm/app/util/system/docker_validator_test.go b/cmd/kubeadm/app/util/system/docker_validator_test.go index 27e94e9130..adc949d57d 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\.0[3,6,9]\..*`, `18\.06\..*`}, + Version: []string{`1\.1[1-3]\..*`, `17\.0[3,6,9]\..*`, `18\.0[6,9]\..*`}, GraphDriver: []string{"driver_1", "driver_2"}, } for _, test := range []struct { diff --git a/cmd/kubeadm/app/util/system/types_unix.go b/cmd/kubeadm/app/util/system/types_unix.go index 71a26c0e6e..3f45d957e5 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\.0[3,6,9]\..*`, `18\.06\..*`}, + Version: []string{`1\.1[1-3]\..*`, `17\.0[3,6,9]\..*`, `18\.0[6,9]\..*`}, 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 34d89f2bd9..0d045699cf 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{`18\.06\..*`}, //Requires [18.06] or later + Version: []string{`18\.0[6,9]\..*`}, GraphDriver: []string{"windowsfilter"}, }, },