github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Fix: update system spec to support Docker 17.03

Browse Source
This commit is contained in:
Yang Guo 2017-09-18 10:14:37 -07:00
parent 8ca1d9f19b
commit 9fbbec1afc
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e_node/system/docker_validator.go
View File

@ -39,7 +39,7 @@ func (d *DockerValidator) Name() string {
const ( const (
dockerEndpoint = "unix:///var/run/docker.sock" dockerEndpoint = "unix:///var/run/docker.sock"
dockerConfigPrefix = "DOCKER_" dockerConfigPrefix = "DOCKER_"
maxDockerValidatedVersion = "1.12" maxDockerValidatedVersion = "17.03"
) )
// TODO(random-liu): Add more validating items. // TODO(random-liu): Add more validating items.
@ -71,8 +71,9 @@ func (d *DockerValidator) validateDockerInfo(spec *DockerSpec, info types.Info)
} }
} }
if !matched { if !matched {
// catch if docker is 1.13+ // If it's of the new Docker version scheme but didn't match above, it
ver := `1\.(1[3-9])\..*|\d{2}\.\d+\.\d+-[a-z]{2}` // must be a newer version than the most recently validated one.
ver := `\d{2}\.\d+\.\d+-[a-z]{2}`
r := regexp.MustCompile(ver) r := regexp.MustCompile(ver)
if r.MatchString(info.ServerVersion) { if r.MatchString(info.ServerVersion) {
d.Reporter.Report(dockerConfigPrefix+"VERSION", info.ServerVersion, good) d.Reporter.Report(dockerConfigPrefix+"VERSION", info.ServerVersion, good)

8
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\.1[1-3]\..*`}, // Requires 1.11+ Version: []string{`1\.1[1-3]\..*`, `17\.03\..*`}, // Requires [1.11, 17.03].
GraphDriver: []string{"driver_1", "driver_2"}, GraphDriver: []string{"driver_1", "driver_2"},
} }
for _, test := range []struct { for _, test := range []struct {
@ -61,10 +61,14 @@ func TestValidateDockerInfo(t *testing.T) {
err: false, err: false,
warn: false, warn: false,
}, },
// TODO remove/change warn value once sig-node supports 17.03-0-ce
{ {
info: types.Info{Driver: "driver_2", ServerVersion: "17.03.0-ce"}, info: types.Info{Driver: "driver_2", ServerVersion: "17.03.0-ce"},
err: false, err: false,
warn: false,
},
{
info: types.Info{Driver: "driver_2", ServerVersion: "17.06.0-ce"},
err: false,
warn: true, warn: true,
}, },
} { } {

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

@ -159,7 +159,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\.1[1-3]\..*`}, // Requires 1.11+ Version: []string{`1\.1[1-3]\..*`, `17\.03\..*`}, // Requires [1.11, 17.03]
GraphDriver: []string{"aufs", "overlay", "overlay2", "devicemapper"}, GraphDriver: []string{"aufs", "overlay", "overlay2", "devicemapper"},
}, },
}, },