diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 8e6049e94eb..2fc64118ba6 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -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 diff --git a/cmd/kubeadm/app/util/system/docker_validator.go b/cmd/kubeadm/app/util/system/docker_validator.go index 01d1f14f32a..85bb0d4de23 100644 --- a/cmd/kubeadm/app/util/system/docker_validator.go +++ b/cmd/kubeadm/app/util/system/docker_validator.go @@ -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. diff --git a/cmd/kubeadm/app/util/system/docker_validator_test.go b/cmd/kubeadm/app/util/system/docker_validator_test.go index 132c3b9cb37..1617813d07c 100644 --- a/cmd/kubeadm/app/util/system/docker_validator_test.go +++ b/cmd/kubeadm/app/util/system/docker_validator_test.go @@ -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, }, diff --git a/cmd/kubeadm/app/util/system/types_unix.go b/cmd/kubeadm/app/util/system/types_unix.go index b4902d37601..ea11416481b 100644 --- a/cmd/kubeadm/app/util/system/types_unix.go +++ b/cmd/kubeadm/app/util/system/types_unix.go @@ -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"}, }, },