Merge pull request #68053 from Pingan2017/rmifblock

clean up unneeded else block
kubernetes · Sep 25, 2018 · 8346631 · 8346631
2 parents fdd9c2e + 2f1284b
commit 8346631
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -139,9 +139,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
 }