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

Merge pull request #84476 from neolit123/1.17-docker-19.03

Browse Source 
kubeadm-validators: bump the latest validated Docker version to 19.03
This commit is contained in:
Kubernetes Prow Robot 2019-10-28 17:49:08 -07:00 committed by GitHub
commit 28887de8cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/dependencies.yaml
View File

@ -25,7 +25,7 @@ dependencies:
match: const etcdImage
- name: "docker"
version: 18.09
version: 19.03
refPaths:
- path: cmd/kubeadm/app/util/system/docker_validator.go
match: latestValidatedDockerVersion

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

@ -46,7 +46,7 @@ func (d *DockerValidator) Name() string {
const (
dockerConfigPrefix = "DOCKER_"
latestValidatedDockerVersion = "18.09"
latestValidatedDockerVersion = "19.03"
)
// Validate is part of the system.Validator interface.

12
cmd/kubeadm/app/util/system/docker_validator_test.go
View File

@ -28,7 +28,7 @@ func TestValidateDockerInfo(t *testing.T) {
Reporter: DefaultReporter,
}
spec := &DockerSpec{
Version: []string{`1\.13\..*`, `17\.0[3,6,9]\..*`, `18\.0[6,9]\..*`},
Version: []string{`1\.13\..*`, `17\.0[3,6,9]\..*`, `18\.0[6,9]\..*`, `19\.03\..*`},
GraphDriver: []string{"driver_1", "driver_2"},
}
for _, test := range []struct {
@ -86,8 +86,14 @@ func TestValidateDockerInfo(t *testing.T) {
warn: false,
},
{
name: "Docker version 19.01.0 is not in the list of validated versions",
info: dockerInfo{Driver: "driver_2", ServerVersion: "19.01.0"},
name: "valid Docker version 19.03.1-ce",
info: dockerInfo{Driver: "driver_2", ServerVersion: "19.03.1-ce"},
err: false,
warn: false,
},
{
name: "Docker version 19.06.0 is not in the list of validated versions",
info: dockerInfo{Driver: "driver_2", ServerVersion: "19.06.0"},
err: false,
warn: true,
},

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

@ -59,7 +59,7 @@ var DefaultSysSpec = SysSpec{
Cgroups: []string{"cpu", "cpuacct", "cpuset", "devices", "freezer", "memory"},
RuntimeSpec: RuntimeSpec{
DockerSpec: &DockerSpec{
Version: []string{`1\.1[1-3]\..*`, `17\.0[3,6,9]\..*`, `18\.0[6,9]\..*`},
Version: []string{`1\.1[1-3]\..*`, `17\.0[3,6,9]\..*`, `18\.0[6,9]\..*`, `19\.03\..*`},
GraphDriver: []string{"aufs", "overlay", "overlay2", "devicemapper", "zfs"},
},
},