Merge pull request #76621 from yujuhong/docker-version-ping

dockershim: Fix negotiating docker API version
This commit is contained in:
Kubernetes Prow Robot 2019-04-15 18:06:05 -07:00 committed by GitHub
commit 9946d92e16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -85,15 +85,12 @@ func newKubeDockerClient(dockerClient *dockerapi.Client, requestTimeout, imagePu
timeout: requestTimeout,
imagePullProgressDeadline: imagePullProgressDeadline,
}
// Notice that this assumes that docker is running before kubelet is started.
v, err := k.Version()
if err != nil {
klog.Errorf("failed to retrieve docker version: %v", err)
klog.Warningf("Using empty version for docker client, this may sometimes cause compatibility issue.")
} else {
// Update client version with real api version.
dockerClient.NegotiateAPIVersionPing(dockertypes.Ping{APIVersion: v.APIVersion})
}
ctx, cancel := k.getTimeoutContext()
defer cancel()
dockerClient.NegotiateAPIVersion(ctx)
return k
}