From 86163979f48cb1b14e30b5b70df6d7271ab31647 Mon Sep 17 00:00:00 2001 From: Ke Zhang Date: Fri, 26 Aug 2016 10:30:39 +0800 Subject: [PATCH] optimize if-else of setupNode of container_manager_linix --- pkg/kubelet/cm/container_manager_linux.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/kubelet/cm/container_manager_linux.go b/pkg/kubelet/cm/container_manager_linux.go index 79accf4b7f..8313bad979 100644 --- a/pkg/kubelet/cm/container_manager_linux.go +++ b/pkg/kubelet/cm/container_manager_linux.go @@ -308,10 +308,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))