Skip to content

K
k3s
Commit f49442d4 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #38502 from resouer/fix-wrong-comment

Automatic merge from submit-queue (batch tested with PRs 38154, 38502) Wrong comment to describe docker version The original comment about minimal docker version fo `room_score_adj` is wrong (though the code is right). Really sorry for misleading :/
parents d8efc779 07d17360
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
pkg/kubelet/dockertools/docker_manager.go
View file @ f49442d4
...@@ -729,7 +729,7 @@ func (dm *DockerManager) runContainer( ...@@ -729,7 +729,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 equal to or 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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment