From 1aebbee7dad248bec0e783337ee173f31d800a66 Mon Sep 17 00:00:00 2001 From: Wenfeng-GAO Date: Sat, 28 Mar 2020 00:04:51 +0800 Subject: [PATCH] simplify code in topologymanager --- pkg/kubelet/cm/topologymanager/policy_restricted.go | 5 +---- pkg/kubelet/cm/topologymanager/policy_single_numa_node.go | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/pkg/kubelet/cm/topologymanager/policy_restricted.go b/pkg/kubelet/cm/topologymanager/policy_restricted.go index c3321c2030e..5ee2f245d63 100644 --- 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 index 0e94c282d48..e26f4cb796b 100644 --- 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.