mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-26 05:03:09 +00:00
Merge pull request #77051 from chenzhiwei/bump-docker-version
Bump minimum docker version to 1.13.1 in kubeadm
This commit is contained in:
commit
59a86822cb
@ -28,7 +28,7 @@ func TestValidateDockerInfo(t *testing.T) {
|
|||||||
Reporter: DefaultReporter,
|
Reporter: DefaultReporter,
|
||||||
}
|
}
|
||||||
spec := &DockerSpec{
|
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"},
|
GraphDriver: []string{"driver_1", "driver_2"},
|
||||||
}
|
}
|
||||||
for _, test := range []struct {
|
for _, test := range []struct {
|
||||||
@ -38,32 +38,20 @@ func TestValidateDockerInfo(t *testing.T) {
|
|||||||
warn bool
|
warn bool
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "unsupported Docker version 1.10.1",
|
name: "unsupported Docker version 1.12.1",
|
||||||
info: types.Info{Driver: "driver_1", ServerVersion: "1.10.1"},
|
info: types.Info{Driver: "driver_2", ServerVersion: "1.12.1"},
|
||||||
err: true,
|
err: true,
|
||||||
warn: false,
|
warn: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "unsupported driver",
|
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,
|
err: true,
|
||||||
warn: false,
|
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",
|
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,
|
err: false,
|
||||||
warn: false,
|
warn: false,
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user