github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #71001 from Deepomatic/recognize_docker_1809_version

Browse Source 
Recognize newer docker versions without -ce/-ee suffix: 18.09.0
This commit is contained in:
k8s-ci-robot 2018-11-13 14:59:36 -08:00 committed by GitHub
commit 48d788de6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/util/system/docker_validator.go
View File

@ -73,7 +73,7 @@ func (d *DockerValidator) validateDockerInfo(spec *DockerSpec, info types.Info)
if !matched { if !matched {
// If it's of the new Docker version scheme but didn't match above, it // If it's of the new Docker version scheme but didn't match above, it
// must be a newer version than the most recently validated one. // must be a newer version than the most recently validated one.
ver := `\d{2}\.\d+\.\d+-[a-z]{2}` ver := `\d{2}\.\d+\.\d+(?:-[a-z]{2})?`
r := regexp.MustCompile(ver) r := regexp.MustCompile(ver)
if r.MatchString(info.ServerVersion) { if r.MatchString(info.ServerVersion) {
d.Reporter.Report(dockerConfigPrefix+"VERSION", info.ServerVersion, good) d.Reporter.Report(dockerConfigPrefix+"VERSION", info.ServerVersion, good)

5
cmd/kubeadm/app/util/system/docker_validator_test.go
View File

@ -81,6 +81,11 @@ func TestValidateDockerInfo(t *testing.T) {
err: false, err: false,
warn: false, warn: false,
}, },
{
info: types.Info{Driver: "driver_2", ServerVersion: "18.09.0"},
err: false,
warn: true,
},
} { } {
warn, err := v.validateDockerInfo(spec, test.info) warn, err := v.validateDockerInfo(spec, test.info)
if !test.err { if !test.err {