github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Upgrade kubeadm's version of docker support

Browse Source
This commit is contained in:
xichengliudui 2018-09-17 04:44:48 -04:00
parent e763a3c56d
commit 97c9fa3cb9
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/util/system/docker_validator.go
View File

@ -38,7 +38,7 @@ func (d *DockerValidator) Name() string {
const ( const (
dockerConfigPrefix = "DOCKER_" dockerConfigPrefix = "DOCKER_"
maxDockerValidatedVersion = "17.03" maxDockerValidatedVersion = "18.06"
) )
// TODO(random-liu): Add more validating items. // TODO(random-liu): Add more validating items.

9
cmd/kubeadm/app/util/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]\..*`, `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"}, GraphDriver: []string{"driver_1", "driver_2"},
} }
for _, test := range []struct { for _, test := range []struct {
@ -69,7 +69,12 @@ func TestValidateDockerInfo(t *testing.T) {
{ {
info: types.Info{Driver: "driver_2", ServerVersion: "17.06.0-ce"}, info: types.Info{Driver: "driver_2", ServerVersion: "17.06.0-ce"},
err: false, 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) warn, err := v.validateDockerInfo(spec, test.info)

2
cmd/kubeadm/app/util/system/types_unix.go
View File

@ -62,7 +62,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]\..*`, `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"}, GraphDriver: []string{"aufs", "overlay", "overlay2", "devicemapper", "zfs"},
}, },
}, },

2
cmd/kubeadm/app/util/system/types_windows.go
View File

@ -38,7 +38,7 @@ var DefaultSysSpec = SysSpec{
Cgroups: []string{}, Cgroups: []string{},
RuntimeSpec: RuntimeSpec{ RuntimeSpec: RuntimeSpec{
DockerSpec: &DockerSpec{ DockerSpec: &DockerSpec{
Version: []string{`17\.03\..*`}, //Requires [17.03] or later Version: []string{`18\.06\..*`}, //Requires [18.06] or later
GraphDriver: []string{"windowsfilter"}, GraphDriver: []string{"windowsfilter"},
}, },
}, },