github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #27017 from yujuhong/rm_version 

Automatic merge from submit-queue

Fix docker api version in kubelet

There are two variables `dockerv110APIVersion` and `dockerV110APIVersion` with
the same purpose, but different values. Remove the incorrect one and fix usage
in the file.

/cc @dchen1107 @Random-Liu
pull/6/head
k8s-merge-robot 2016-06-12 19:31:06 -07:00 committed by GitHub
parent 628af356b8 8866a894e4
commit 5d6397e9ee
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/kubelet/dockertools/manager.go
View File

@ -69,7 +69,9 @@ const (
minimumDockerAPIVersion = "1.20" minimumDockerAPIVersion = "1.20"
dockerv110APIVersion = "1.21" // Remote API version for docker daemon version v1.10
// https://docs.docker.com/engine/reference/api/docker_remote_api/
dockerV110APIVersion = "1.22"
// ndots specifies the minimum number of dots that a domain name must contain for the resolver to consider it as FQDN (fully-qualified) // ndots specifies the minimum number of dots that a domain name must contain for the resolver to consider it as FQDN (fully-qualified)
// we want to able to consider SRV lookup names like _dns._udp.kube-dns.default.svc to be considered relative. // we want to able to consider SRV lookup names like _dns._udp.kube-dns.default.svc to be considered relative.
@ -89,10 +91,6 @@ const (
// '{{.HostConfig.NetworkMode}}'. // '{{.HostConfig.NetworkMode}}'.
namespaceModeHost = "host" namespaceModeHost = "host"
// Remote API version for docker daemon version v1.10
// https://docs.docker.com/engine/reference/api/docker_remote_api/
dockerV110APIVersion = "1.22"
// The expiration time of version cache. // The expiration time of version cache.
versionCacheTTL = 60 * time.Second versionCacheTTL = 60 * time.Second
) )
@ -645,7 +643,7 @@ func (dm *DockerManager) runContainer(
} }
// If current api version is newer than docker 1.10 requested, set OomScoreAdj to HostConfig // If current api version is newer than docker 1.10 requested, set OomScoreAdj to HostConfig
result, err := dm.checkDockerAPIVersion(dockerv110APIVersion) result, err := dm.checkDockerAPIVersion(dockerV110APIVersion)
if err != nil { if err != nil {
glog.Errorf("Failed to check docker api version: %v", err) glog.Errorf("Failed to check docker api version: %v", err)
} else if result >= 0 { } else if result >= 0 {
@ -1578,7 +1576,7 @@ func (dm *DockerManager) runContainerInPod(pod *api.Pod, container *api.Containe
func (dm *DockerManager) applyOOMScoreAdjIfNeeded(pod *api.Pod, container *api.Container, containerInfo *dockertypes.ContainerJSON) error { func (dm *DockerManager) applyOOMScoreAdjIfNeeded(pod *api.Pod, container *api.Container, containerInfo *dockertypes.ContainerJSON) error {
// Compare current API version with expected api version. // Compare current API version with expected api version.
result, err := dm.checkDockerAPIVersion(dockerv110APIVersion) result, err := dm.checkDockerAPIVersion(dockerV110APIVersion)
if err != nil { if err != nil {
return fmt.Errorf("Failed to check docker api version: %v", err) return fmt.Errorf("Failed to check docker api version: %v", err)
} }