From e43f0a52933be0d78abe590beddfdda6d02b4396 Mon Sep 17 00:00:00 2001 From: nolancon Date: Tue, 17 Dec 2019 09:03:19 +0000 Subject: [PATCH] Reinstate canAdmitPodResult in policy_none: This is to keep consistency with the other policies. This change may be made across all policies in a future PR, but removing it from the scope of this PR for now. --- pkg/kubelet/cm/topologymanager/policy_none.go | 10 ++++++++-- pkg/kubelet/cm/topologymanager/policy_none_test.go | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/cm/topologymanager/policy_none.go b/pkg/kubelet/cm/topologymanager/policy_none.go index 2b79fc0c4ef..7e5010a765d 100644 --- a/pkg/kubelet/cm/topologymanager/policy_none.go +++ b/pkg/kubelet/cm/topologymanager/policy_none.go @@ -36,6 +36,12 @@ func (p *nonePolicy) Name() string { return PolicyNone } -func (p *nonePolicy) Merge(providersHints []map[string][]TopologyHint) (TopologyHint, lifecycle.PodAdmitResult) { - return TopologyHint{}, lifecycle.PodAdmitResult{Admit: true} +func (p *nonePolicy) canAdmitPodResult(hint *TopologyHint) lifecycle.PodAdmitResult { + return lifecycle.PodAdmitResult{ + Admit: true, + } +} + +func (p *nonePolicy) Merge(providersHints []map[string][]TopologyHint) (TopologyHint, lifecycle.PodAdmitResult) { + return TopologyHint{}, p.canAdmitPodResult(nil) } diff --git a/pkg/kubelet/cm/topologymanager/policy_none_test.go b/pkg/kubelet/cm/topologymanager/policy_none_test.go index e65d9317467..ee674dcf6de 100644 --- a/pkg/kubelet/cm/topologymanager/policy_none_test.go +++ b/pkg/kubelet/cm/topologymanager/policy_none_test.go @@ -39,7 +39,7 @@ func TestPolicyNoneName(t *testing.T) { } } -func TestPolicyNoneMerge(t *testing.T) { +func TestPolicyNoneCanAdmitPodResult(t *testing.T) { tcases := []struct { name string providersHints []map[string][]TopologyHint