From d4aaacfc1807938d3bd1ea0127fc4106bfe6d983 Mon Sep 17 00:00:00 2001 From: Chen Zhiwei Date: Thu, 25 Apr 2019 05:58:53 +0000 Subject: [PATCH] Bump minimum docker version to 1.13.1 in kubeadm --- .../app/util/system/docker_validator_test.go | 22 +++++-------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/cmd/kubeadm/app/util/system/docker_validator_test.go b/cmd/kubeadm/app/util/system/docker_validator_test.go index adc949d57dd..765aa0cb80e 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\.1[1-3]\..*`, `17\.0[3,6,9]\..*`, `18\.0[6,9]\..*`}, + Version: []string{`1\.13\..*`, `17\.0[3,6,9]\..*`, `18\.0[6,9]\..*`}, GraphDriver: []string{"driver_1", "driver_2"}, } for _, test := range []struct { @@ -38,32 +38,20 @@ func TestValidateDockerInfo(t *testing.T) { warn bool }{ { - name: "unsupported Docker version 1.10.1", - info: types.Info{Driver: "driver_1", ServerVersion: "1.10.1"}, + name: "unsupported Docker version 1.12.1", + info: types.Info{Driver: "driver_2", ServerVersion: "1.12.1"}, err: true, warn: false, }, { name: "unsupported driver", - info: types.Info{Driver: "bad_driver", ServerVersion: "1.11.1"}, + info: types.Info{Driver: "bad_driver", ServerVersion: "1.13.1"}, err: true, warn: false, }, - { - name: "valid Docker version 1.11.1", - info: types.Info{Driver: "driver_1", ServerVersion: "1.11.1"}, - err: false, - warn: false, - }, - { - name: "valid Docker version 1.12.1", - info: types.Info{Driver: "driver_2", ServerVersion: "1.12.1"}, - err: false, - warn: false, - }, { name: "valid Docker version 1.13.1", - info: types.Info{Driver: "driver_2", ServerVersion: "1.13.1"}, + info: types.Info{Driver: "driver_1", ServerVersion: "1.13.1"}, err: false, warn: false, },