From eeefd2ca87cad04e58f5ad9c6e336c01fc503c6f Mon Sep 17 00:00:00 2001 From: Derek McQuay Date: Thu, 2 Mar 2017 09:03:10 -0800 Subject: [PATCH] kubeadm: fail on docker version 1.13+, CE, and EE --- test/e2e_node/system/docker_validator_test.go | 12 +++++++++++- test/e2e_node/system/types.go | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/test/e2e_node/system/docker_validator_test.go b/test/e2e_node/system/docker_validator_test.go index 0672b0c2988..de250c43347 100644 --- a/test/e2e_node/system/docker_validator_test.go +++ b/test/e2e_node/system/docker_validator_test.go @@ -28,7 +28,7 @@ func TestValidateDockerInfo(t *testing.T) { Reporter: DefaultReporter, } spec := &DockerSpec{ - Version: []string{`1\.(9|\d{2,})\..*`}, + Version: []string{`1\.(9|\d?[0-2]{2,})\..*`}, // Requires 1.9+ GraphDriver: []string{"driver_1", "driver_2"}, } for _, test := range []struct { @@ -47,6 +47,16 @@ func TestValidateDockerInfo(t *testing.T) { info: types.Info{Driver: "driver_2", ServerVersion: "1.8.1"}, err: true, }, + // TODO remove once sig-node supports 1.13 + { + info: types.Info{Driver: "driver_2", ServerVersion: "1.13.1"}, + err: true, + }, + // TODO remove once sig-node supports 17.03-0-ce + { + info: types.Info{Driver: "driver_2", ServerVersion: "17.03.0-ce"}, + err: true, + }, } { err := v.validateDockerInfo(spec, test.info) if !test.err { diff --git a/test/e2e_node/system/types.go b/test/e2e_node/system/types.go index 79e0d779852..706b01fced9 100644 --- a/test/e2e_node/system/types.go +++ b/test/e2e_node/system/types.go @@ -114,7 +114,7 @@ var DefaultSysSpec = SysSpec{ Cgroups: []string{"cpu", "cpuacct", "cpuset", "devices", "freezer", "memory"}, RuntimeSpec: RuntimeSpec{ DockerSpec: &DockerSpec{ - Version: []string{`1\.(9|\d{2,})\..*`}, // Requires 1.9+ + Version: []string{`1\.(9|1[0-2])\..*`}, // Requires 1.9+ // TODO(random-liu): Validate overlay2. GraphDriver: []string{"aufs", "overlay", "devicemapper"}, },