github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #89581 from Wenfeng-GAO/simplify

Browse Source 
simplify code in topologymanager
This commit is contained in:
Kubernetes Prow Robot
2020-04-02 23:07:46 -07:00
committed by GitHub
parent 7bd48eb3f6 1aebbee7da
commit b030be376b
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/cm/topologymanager/policy_restricted.go
View File

@@ -35,10 +35,7 @@ func (p *restrictedPolicy) Name() string {
} }
func (p *restrictedPolicy) canAdmitPodResult(hint *TopologyHint) bool { func (p *restrictedPolicy) canAdmitPodResult(hint *TopologyHint) bool {
if !hint.Preferred { return hint.Preferred
return false
}
return true
} }
func (p *restrictedPolicy) Merge(providersHints []map[string][]TopologyHint) (TopologyHint, bool) { func (p *restrictedPolicy) Merge(providersHints []map[string][]TopologyHint) (TopologyHint, bool) {

5
pkg/kubelet/cm/topologymanager/policy_single_numa_node.go
View File

@@ -40,10 +40,7 @@ func (p *singleNumaNodePolicy) Name() string {
} }
func (p *singleNumaNodePolicy) canAdmitPodResult(hint *TopologyHint) bool { func (p *singleNumaNodePolicy) canAdmitPodResult(hint *TopologyHint) bool {
if !hint.Preferred { return hint.Preferred
return false
}
return true
} }
// Return hints that have valid bitmasks with exactly one bit set. // Return hints that have valid bitmasks with exactly one bit set.