Merge pull request #47900 from yiqinguo/yiqinguo_add_type_judgment

Automatic merge from submit-queue Add type conversion judgment If do not type conversion judgment, there may be panic. **Release note**: ```release-note NONE ```

Merge pull request #47900 from yiqinguo/yiqinguo_add_type_judgment
c9ad8dcd · Kubernetes Submit Queue · GitHub · 343d751b · d170b0ca · c9ad8dcd
Commit c9ad8dcd authored Jun 29, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 29, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

docker_service.go pkg/kubelet/dockershim/docker_service.go +4 -1

No files found.
--- a/pkg/kubelet/dockershim/docker_service.go
+++ b/pkg/kubelet/dockershim/docker_service.go
@@ -455,10 +455,13 @@ func (ds *dockerService) getDockerVersionFromCache() (*dockertypes.Version, erro
 	// We only store on key in the cache.
 	const dummyKey = "version"
 	value, err := ds.versionCache.Get(dummyKey)
-	dv := value.(*dockertypes.Version)
 	if err != nil {
 		return nil, err
 	}
+	dv, ok := value.(*dockertypes.Version)
+	if !ok {
+		return nil, fmt.Errorf("Converted to *dockertype.Version error")
+	}
 	return dv, nil
 }