Merge pull request #44047 from yujuhong/dont_panic

Automatic merge from submit-queue (batch tested with PRs 44047, 43514, 44037, 43467)

Check the error before parsing the apiversion

This fixes #44027
This commit is contained in:
Kubernetes Submit Queue
2017-04-04 14:33:20 -07:00
committed by GitHub

View File

@@ -420,6 +420,9 @@ func (ds *dockerService) getDockerAPIVersion() (*semver.Version, error) {
} else {
dv, err = ds.getDockerVersion()
}
if err != nil {
return nil, err
}
apiVersion, err := semver.Parse(dv.APIVersion)
if err != nil {