github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #80961 from jfbai/move-docker-specific-code-to-dockershim

Browse Source 
Move docker specific const to dockershim.
This commit is contained in:
Kubernetes Prow Robot 2019-08-05 11:59:51 -07:00 committed by GitHub
commit 785bbabb11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/kubelet/cm/container_manager_linux.go
View File

@ -67,13 +67,6 @@ import (
) )
const ( const (
// The percent of the machine memory capacity. The value is used to calculate
// docker memory resource container's hardlimit to workaround docker memory
// leakage issue. Please see kubernetes/issues/9881 for more detail.
DockerMemoryLimitThresholdPercent = 70
// The minimum memory limit allocated to docker container: 150Mi
MinDockerMemoryLimit = 150 * 1024 * 1024
dockerProcessName = "docker" dockerProcessName = "docker"
dockerPidFile = "/var/run/docker.pid" dockerPidFile = "/var/run/docker.pid"
containerdProcessName = "docker-containerd" containerdProcessName = "docker-containerd"

10
pkg/kubelet/dockershim/cm/container_manager_linux.go
View File

@ -37,11 +37,13 @@ import (
) )
const ( const (
// The percent of the machine memory capacity. // The percent of the machine memory capacity. The value is used to calculate
dockerMemoryLimitThresholdPercent = kubecm.DockerMemoryLimitThresholdPercent // docker memory resource container's hardlimit to workaround docker memory
// leakage issue. Please see kubernetes/issues/9881 for more detail.
dockerMemoryLimitThresholdPercent = 70
// The minimum memory limit allocated to docker container. // The minimum memory limit allocated to docker container: 150Mi
minDockerMemoryLimit = kubecm.MinDockerMemoryLimit minDockerMemoryLimit = 150 * 1024 * 1024
// The Docker OOM score adjustment. // The Docker OOM score adjustment.
dockerOOMScoreAdj = qos.DockerOOMScoreAdj dockerOOMScoreAdj = qos.DockerOOMScoreAdj