github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 18:31:15 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: fail on docker version 1.13+, CE, and EE

Browse Source
This commit is contained in:
Derek McQuay 2017-03-02 09:03:10 -08:00
parent 3769404b32
commit eeefd2ca87
No known key found for this signature in database
GPG Key ID: 92A7BC0C86B0B91A
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/e2e_node/system/docker_validator_test.go
View File

@ -28,7 +28,7 @@ func TestValidateDockerInfo(t *testing.T) {
Reporter: DefaultReporter, Reporter: DefaultReporter,
} }
spec := &DockerSpec{ 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"}, GraphDriver: []string{"driver_1", "driver_2"},
} }
for _, test := range []struct { for _, test := range []struct {
@ -47,6 +47,16 @@ func TestValidateDockerInfo(t *testing.T) {
info: types.Info{Driver: "driver_2", ServerVersion: "1.8.1"}, info: types.Info{Driver: "driver_2", ServerVersion: "1.8.1"},
err: true, 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) err := v.validateDockerInfo(spec, test.info)
if !test.err { if !test.err {

2
test/e2e_node/system/types.go
View File

@ -114,7 +114,7 @@ var DefaultSysSpec = SysSpec{
Cgroups: []string{"cpu", "cpuacct", "cpuset", "devices", "freezer", "memory"}, Cgroups: []string{"cpu", "cpuacct", "cpuset", "devices", "freezer", "memory"},
RuntimeSpec: RuntimeSpec{ RuntimeSpec: RuntimeSpec{
DockerSpec: &DockerSpec{ 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. // TODO(random-liu): Validate overlay2.
GraphDriver: []string{"aufs", "overlay", "devicemapper"}, GraphDriver: []string{"aufs", "overlay", "devicemapper"},
}, },