github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues 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
commit b030be376b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 8 deletions
Show Stats 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 {
if !hint.Preferred {
return false
}
return true
return hint.Preferred
}
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 {
if !hint.Preferred {
return false
}
return true
return hint.Preferred
}
// Return hints that have valid bitmasks with exactly one bit set.