Skip to content

Commit 59a8682

Browse files
authored
Merge pull request kubernetes#77051 from chenzhiwei/bump-docker-version
Bump minimum docker version to 1.13.1 in kubeadm
2 parents 24c964d + d4aaacf commit 59a8682

File tree

1 file changed

+5
-17
lines changed

1 file changed

+5
-17
lines changed

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

Lines changed: 5 additions & 17 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\.1[1-3]\..*`, `17\.0[3,6,9]\..*`, `18\.0[6,9]\..*`},
31+
Version: []string{`1\.13\..*`, `17\.0[3,6,9]\..*`, `18\.0[6,9]\..*`},
3232
GraphDriver: []string{"driver_1", "driver_2"},
3333
}
3434
for _, test := range []struct {
@@ -38,32 +38,20 @@ func TestValidateDockerInfo(t *testing.T) {
3838
warn bool
3939
}{
4040
{
41-
name: "unsupported Docker version 1.10.1",
42-
info: types.Info{Driver: "driver_1", ServerVersion: "1.10.1"},
41+
name: "unsupported Docker version 1.12.1",
42+
info: types.Info{Driver: "driver_2", ServerVersion: "1.12.1"},
4343
err: true,
4444
warn: false,
4545
},
4646
{
4747
name: "unsupported driver",
48-
info: types.Info{Driver: "bad_driver", ServerVersion: "1.11.1"},
48+
info: types.Info{Driver: "bad_driver", ServerVersion: "1.13.1"},
4949
err: true,
5050
warn: false,
5151
},
52-
{
53-
name: "valid Docker version 1.11.1",
54-
info: types.Info{Driver: "driver_1", ServerVersion: "1.11.1"},
55-
err: false,
56-
warn: false,
57-
},
58-
{
59-
name: "valid Docker version 1.12.1",
60-
info: types.Info{Driver: "driver_2", ServerVersion: "1.12.1"},
61-
err: false,
62-
warn: false,
63-
},
6452
{
6553
name: "valid Docker version 1.13.1",
66-
info: types.Info{Driver: "driver_2", ServerVersion: "1.13.1"},
54+
info: types.Info{Driver: "driver_1", ServerVersion: "1.13.1"},
6755
err: false,
6856
warn: false,
6957
},

0 commit comments

Comments
 (0)