From 2f1284bc345b3ea0ac698d4a0ecec6287ea979a4 Mon Sep 17 00:00:00 2001 From: Pingan2017 Date: Thu, 30 Aug 2018 17:18:56 +0800 Subject: [PATCH] cleanup unneeded if block --- pkg/kubelet/cm/cgroup_manager_linux.go | 6 ++---- pkg/kubelet/cm/pod_container_manager_linux.go | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkg/kubelet/cm/cgroup_manager_linux.go b/pkg/kubelet/cm/cgroup_manager_linux.go index 6a4d65cd858..fbc818c9c5c 100644 --- a/pkg/kubelet/cm/cgroup_manager_linux.go +++ b/pkg/kubelet/cm/cgroup_manager_linux.go @@ -204,18 +204,16 @@ func NewCgroupManager(cs *CgroupSubsystems, cgroupDriver string) CgroupManager { func (m *cgroupManagerImpl) Name(name CgroupName) string { if m.adapter.cgroupManagerType == libcontainerSystemd { return name.ToSystemd() - } else { - return name.ToCgroupfs() } + return name.ToCgroupfs() } // CgroupName converts the literal cgroupfs name on the host to an internal identifier. func (m *cgroupManagerImpl) CgroupName(name string) CgroupName { if m.adapter.cgroupManagerType == libcontainerSystemd { return ParseSystemdToCgroupName(name) - } else { - return ParseCgroupfsToCgroupName(name) } + return ParseCgroupfsToCgroupName(name) } // buildCgroupPaths builds a path to each cgroup subsystem for the specified name. diff --git a/pkg/kubelet/cm/pod_container_manager_linux.go b/pkg/kubelet/cm/pod_container_manager_linux.go index 703437160dc..ed399567b48 100644 --- a/pkg/kubelet/cm/pod_container_manager_linux.go +++ b/pkg/kubelet/cm/pod_container_manager_linux.go @@ -136,9 +136,8 @@ func (m *podContainerManagerImpl) killOnePid(pid int) error { // also does this. glog.V(3).Infof("process with pid %v no longer exists", pid) return nil - } else { - return err } + return err } return nil }