Merge pull request kubernetes#89581 from Wenfeng-GAO/simplify

k8s-ci-robot · web-flow · commit b030be376b75 · 2020-04-02T23:07:46.000-07:00
simplify code in topologymanager
diff --git a/pkg/kubelet/cm/topologymanager/policy_restricted.go b/pkg/kubelet/cm/topologymanager/policy_restricted.go
@@ -35,10 +35,7 @@ func (p *restrictedPolicy) Name() string {
 }
 
 func (p *restrictedPolicy) canAdmitPodResult(hint *TopologyHint) bool {
-	if !hint.Preferred {
-		return false
-	}
-	return true
+	return hint.Preferred
 }
 
 func (p *restrictedPolicy) Merge(providersHints []map[string][]TopologyHint) (TopologyHint, bool) {
diff --git a/pkg/kubelet/cm/topologymanager/policy_single_numa_node.go b/pkg/kubelet/cm/topologymanager/policy_single_numa_node.go
@@ -40,10 +40,7 @@ func (p *singleNumaNodePolicy) Name() string {
 }
 
 func (p *singleNumaNodePolicy) canAdmitPodResult(hint *TopologyHint) bool {
-	if !hint.Preferred {
-		return false
-	}
-	return true
+	return hint.Preferred
 }
 
 // Return hints that have valid bitmasks with exactly one bit set.

Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,7 @@ func (p *restrictedPolicy) Name() string {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`func (p restrictedPolicy) canAdmitPodResult(hint TopologyHint) bool {`
`38`		`- if !hint.Preferred {`
`39`		`- return false`
`40`		`- }`
`41`		`- return true`
	`38`	`+ return hint.Preferred`
`42`	`39`	`}`
`43`	`40`
`44`	`41`	`func (p *restrictedPolicy) Merge(providersHints []map[string][]TopologyHint) (TopologyHint, bool) {`
Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,7 @@ func (p *singleNumaNodePolicy) Name() string {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`func (p singleNumaNodePolicy) canAdmitPodResult(hint TopologyHint) bool {`
`43`		`- if !hint.Preferred {`
`44`		`- return false`
`45`		`- }`
`46`		`- return true`
	`43`	`+ return hint.Preferred`
`47`	`44`	`}`
`48`	`45`
`49`	`46`	`// Return hints that have valid bitmasks with exactly one bit set.`