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

Merge pull request #31489 from ZTE-PaaS/zhangke-patch-030 

Automatic merge from submit-queue

optimize if-else of setupNode of container_manager_linix

make the code more readable
pull/6/head
Kubernetes Submit Queue 2016-09-05 17:35:09 -07:00 committed by GitHub
parent f06dc326d3 86163979f4
commit 06b6fb5729
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -328,10 +328,8 @@ func (cm *containerManagerImpl) setupNode() error {
if cm.ContainerRuntime == "docker" {
if cm.RuntimeCgroupsName != "" {
cont := newSystemCgroups(cm.RuntimeCgroupsName)
info, err := cm.cadvisorInterface.MachineInfo()
var capacity = api.ResourceList{}
if err != nil {
} else {
if info, err := cm.cadvisorInterface.MachineInfo(); err == nil {
capacity = cadvisor.CapacityFromMachineInfo(info)
}
memoryLimit := (int64(capacity.Memory().Value() * DockerMemoryLimitThresholdPercent / 100))