Commit 97c9fa3c authored by xichengliudui's avatar xichengliudui

Upgrade kubeadm's version of docker support

parent e763a3c5
......@@ -38,7 +38,7 @@ func (d *DockerValidator) Name() string {
const (
dockerConfigPrefix = "DOCKER_"
maxDockerValidatedVersion = "17.03"
maxDockerValidatedVersion = "18.06"
)
// TODO(random-liu): Add more validating items.
......
......@@ -28,7 +28,7 @@ func TestValidateDockerInfo(t *testing.T) {
Reporter: DefaultReporter,
}
spec := &DockerSpec{
Version: []string{`1\.1[1-3]\..*`, `17\.03\..*`}, // Requires [1.11, 17.03].
Version: []string{`1\.1[1-3]\..*`, `18\.06\..*`}, // Requires [1.11, 18.06].
GraphDriver: []string{"driver_1", "driver_2"},
}
for _, test := range []struct {
......@@ -69,7 +69,12 @@ func TestValidateDockerInfo(t *testing.T) {
{
info: types.Info{Driver: "driver_2", ServerVersion: "17.06.0-ce"},
err: false,
warn: true,
warn: false,
},
{
info: types.Info{Driver: "driver_2", ServerVersion: "18.06.0-ce"},
err: false,
warn: false,
},
} {
warn, err := v.validateDockerInfo(spec, test.info)
......
......@@ -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\.03\..*`}, // Requires [1.11, 17.03]
Version: []string{`1\.1[1-3]\..*`, `18\.06\..*`}, // Requires [1.11, 18.06]
GraphDriver: []string{"aufs", "overlay", "overlay2", "devicemapper", "zfs"},
},
},
......
......@@ -38,7 +38,7 @@ var DefaultSysSpec = SysSpec{
Cgroups: []string{},
RuntimeSpec: RuntimeSpec{
DockerSpec: &DockerSpec{
Version: []string{`17\.03\..*`}, //Requires [17.03] or later
Version: []string{`18\.06\..*`}, //Requires [18.06] or later
GraphDriver: []string{"windowsfilter"},
},
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment