From 5726b22fbcaa758e40aa192a5296d5af19d0b4af Mon Sep 17 00:00:00 2001 From: Jianfei Bai Date: Sun, 4 Aug 2019 21:38:00 +0800 Subject: [PATCH] Move docker specific const to dockershim. --- pkg/kubelet/cm/container_manager_linux.go | 7 ------- pkg/kubelet/dockershim/cm/container_manager_linux.go | 10 ++++++---- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/pkg/kubelet/cm/container_manager_linux.go b/pkg/kubelet/cm/container_manager_linux.go index ed16b0e032e..4c09fde5d76 100644 --- a/pkg/kubelet/cm/container_manager_linux.go +++ b/pkg/kubelet/cm/container_manager_linux.go @@ -67,13 +67,6 @@ import ( ) 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" dockerPidFile = "/var/run/docker.pid" containerdProcessName = "docker-containerd" diff --git a/pkg/kubelet/dockershim/cm/container_manager_linux.go b/pkg/kubelet/dockershim/cm/container_manager_linux.go index 2abedfa0bc9..37ab7dcb69d 100644 --- a/pkg/kubelet/dockershim/cm/container_manager_linux.go +++ b/pkg/kubelet/dockershim/cm/container_manager_linux.go @@ -37,11 +37,13 @@ import ( ) const ( - // The percent of the machine memory capacity. - dockerMemoryLimitThresholdPercent = kubecm.DockerMemoryLimitThresholdPercent + // 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. - minDockerMemoryLimit = kubecm.MinDockerMemoryLimit + // The minimum memory limit allocated to docker container: 150Mi + minDockerMemoryLimit = 150 * 1024 * 1024 // The Docker OOM score adjustment. dockerOOMScoreAdj = qos.DockerOOMScoreAdj