github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 02:34:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #44047 from yujuhong/dont_panic

Browse Source 
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
commit 1a43fd0a63
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/dockershim/docker_service.go
View File

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