github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 06:01:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #68929 from FengyunPan2/fix-memoryLimit

Browse Source 
Configure resource-only container with memory limit
This commit is contained in:
k8s-ci-robot
2018-09-27 06:06:39 -07:00
committed by GitHub
parent 4215774643 6af9e97fa5
commit 12787275f4
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,8 +101,15 @@ func (m *containerManager) doWork() {
func createCgroupManager(name string) (*fs.Manager, error) {
var memoryLimit uint64
memoryCapacity, err := getMemoryCapacity()
if err != nil || memoryCapacity*dockerMemoryLimitThresholdPercent/100 < minDockerMemoryLimit {
if err != nil {
glog.Errorf("Failed to get the memory capacity on machine: %v", err)
} else {
memoryLimit = memoryCapacity * dockerMemoryLimitThresholdPercent / 100
}
if err != nil || memoryLimit < minDockerMemoryLimit {
memoryLimit = minDockerMemoryLimit
}
glog.V(2).Infof("Configure resource-only container %q with memory limit: %d", name, memoryLimit)