github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Reinstate canAdmitPodResult in policy_none:

Browse Source 
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.
This commit is contained in:
nolancon 2019-12-17 09:03:19 +00:00
parent 4cc5b9e46c
commit e43f0a5293
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubelet/cm/topologymanager/policy_none.go
View File

@ -36,6 +36,12 @@ func (p *nonePolicy) Name() string {
return PolicyNone return PolicyNone
} }
func (p *nonePolicy) Merge(providersHints []map[string][]TopologyHint) (TopologyHint, lifecycle.PodAdmitResult) { func (p *nonePolicy) canAdmitPodResult(hint *TopologyHint) lifecycle.PodAdmitResult {
return TopologyHint{}, lifecycle.PodAdmitResult{Admit: true} return lifecycle.PodAdmitResult{
Admit: true,
}
}
func (p *nonePolicy) Merge(providersHints []map[string][]TopologyHint) (TopologyHint, lifecycle.PodAdmitResult) {
return TopologyHint{}, p.canAdmitPodResult(nil)
} }

2
pkg/kubelet/cm/topologymanager/policy_none_test.go
View File

@ -39,7 +39,7 @@ func TestPolicyNoneName(t *testing.T) {
} }
} }
func TestPolicyNoneMerge(t *testing.T) { func TestPolicyNoneCanAdmitPodResult(t *testing.T) {
tcases := []struct { tcases := []struct {
name string name string
providersHints []map[string][]TopologyHint providersHints []map[string][]TopologyHint