github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-19 09:52:49 +00:00
Code Issues Projects Releases Wiki Activity

Update sys spec to support docker 1.11-1.13 and overlay2.

Browse Source
This commit is contained in:
Lantao Liu 2017-09-02 00:51:48 +00:00
parent 759ba487b3
commit 73d5f53465
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
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|1[0-2])\..*`}, // Requires 1.9+ Version: []string{`1\.1[1-3]\..*`}, // Requires 1.11+
GraphDriver: []string{"driver_1", "driver_2"}, GraphDriver: []string{"driver_1", "driver_2"},
} }
for _, test := range []struct { for _, test := range []struct {
@ -38,24 +38,28 @@ func TestValidateDockerInfo(t *testing.T) {
}{ }{
{ {
info: types.Info{Driver: "driver_1", ServerVersion: "1.10.1"}, info: types.Info{Driver: "driver_1", ServerVersion: "1.10.1"},
err: true,
warn: false,
},
{
info: types.Info{Driver: "bad_driver", ServerVersion: "1.11.1"},
err: true,
warn: false,
},
{
info: types.Info{Driver: "driver_1", ServerVersion: "1.11.1"},
err: false, err: false,
warn: false, warn: false,
}, },
{ {
info: types.Info{Driver: "bad_driver", ServerVersion: "1.9.1"}, info: types.Info{Driver: "driver_2", ServerVersion: "1.12.1"},
err: true, err: false,
warn: false, warn: false,
}, },
{
info: types.Info{Driver: "driver_2", ServerVersion: "1.8.1"},
err: true,
warn: false,
},
// TODO remove/change warn value once sig-node supports 1.13
{ {
info: types.Info{Driver: "driver_2", ServerVersion: "1.13.1"}, info: types.Info{Driver: "driver_2", ServerVersion: "1.13.1"},
err: false, err: false,
warn: true, warn: false,
}, },
// TODO remove/change warn value once sig-node supports 17.03-0-ce // TODO remove/change warn value once sig-node supports 17.03-0-ce
{ {

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

@ -159,9 +159,8 @@ 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|1[0-2])\..*`}, // Requires 1.9+ Version: []string{`1\.1[1-3]\..*`}, // Requires 1.11+
// TODO(random-liu): Validate overlay2. GraphDriver: []string{"aufs", "overlay", "overlay2", "devicemapper"},
GraphDriver: []string{"aufs", "overlay", "devicemapper"},
}, },
}, },
} }