Skip to content

Commit 28887de

Browse files
authored
Merge pull request kubernetes#84476 from neolit123/1.17-docker-19.03
kubeadm-validators: bump the latest validated Docker version to 19.03
2 parents b8f03a1 + 772e2e4 commit 28887de

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

build/dependencies.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies:
2525
match: const etcdImage
2626

2727
- name: "docker"
28-
version: 18.09
28+
version: 19.03
2929
refPaths:
3030
- path: cmd/kubeadm/app/util/system/docker_validator.go
3131
match: latestValidatedDockerVersion

cmd/kubeadm/app/util/system/docker_validator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func (d *DockerValidator) Name() string {
4646

4747
const (
4848
dockerConfigPrefix = "DOCKER_"
49-
latestValidatedDockerVersion = "18.09"
49+
latestValidatedDockerVersion = "19.03"
5050
)
5151

5252
// Validate is part of the system.Validator interface.

cmd/kubeadm/app/util/system/docker_validator_test.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func TestValidateDockerInfo(t *testing.T) {
2828
Reporter: DefaultReporter,
2929
}
3030
spec := &DockerSpec{
31-
Version: []string{`1\.13\..*`, `17\.0[3,6,9]\..*`, `18\.0[6,9]\..*`},
31+
Version: []string{`1\.13\..*`, `17\.0[3,6,9]\..*`, `18\.0[6,9]\..*`, `19\.03\..*`},
3232
GraphDriver: []string{"driver_1", "driver_2"},
3333
}
3434
for _, test := range []struct {
@@ -86,8 +86,14 @@ func TestValidateDockerInfo(t *testing.T) {
8686
warn: false,
8787
},
8888
{
89-
name: "Docker version 19.01.0 is not in the list of validated versions",
90-
info: dockerInfo{Driver: "driver_2", ServerVersion: "19.01.0"},
89+
name: "valid Docker version 19.03.1-ce",
90+
info: dockerInfo{Driver: "driver_2", ServerVersion: "19.03.1-ce"},
91+
err: false,
92+
warn: false,
93+
},
94+
{
95+
name: "Docker version 19.06.0 is not in the list of validated versions",
96+
info: dockerInfo{Driver: "driver_2", ServerVersion: "19.06.0"},
9197
err: false,
9298
warn: true,
9399
},

cmd/kubeadm/app/util/system/types_unix.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ var DefaultSysSpec = SysSpec{
5959
Cgroups: []string{"cpu", "cpuacct", "cpuset", "devices", "freezer", "memory"},
6060
RuntimeSpec: RuntimeSpec{
6161
DockerSpec: &DockerSpec{
62-
Version: []string{`1\.1[1-3]\..*`, `17\.0[3,6,9]\..*`, `18\.0[6,9]\..*`},
62+
Version: []string{`1\.1[1-3]\..*`, `17\.0[3,6,9]\..*`, `18\.0[6,9]\..*`, `19\.03\..*`},
6363
GraphDriver: []string{"aufs", "overlay", "overlay2", "devicemapper", "zfs"},
6464
},
6565
},

0 commit comments

Comments
 (0)