From e82fa41fb2c91ec285bd1324aaa76f386c1ce36b Mon Sep 17 00:00:00 2001 From: nolancon Date: Wed, 8 May 2019 08:45:42 +0100 Subject: [PATCH] More Intuitive TopologyHints - topology manager policies --- pkg/kubelet/cm/topologymanager/policy_preferred.go | 2 +- pkg/kubelet/cm/topologymanager/policy_strict.go | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/kubelet/cm/topologymanager/policy_preferred.go b/pkg/kubelet/cm/topologymanager/policy_preferred.go index 6db6fb5641a..04b2588b626 100644 --- a/pkg/kubelet/cm/topologymanager/policy_preferred.go +++ b/pkg/kubelet/cm/topologymanager/policy_preferred.go @@ -36,7 +36,7 @@ func (p *preferredPolicy) Name() string { return string(PolicyPreferred) } -func (p *preferredPolicy) CanAdmitPodResult(result TopologyHints) lifecycle.PodAdmitResult { +func (p *preferredPolicy) CanAdmitPodResult(admit bool) lifecycle.PodAdmitResult { return lifecycle.PodAdmitResult{ Admit: true, } diff --git a/pkg/kubelet/cm/topologymanager/policy_strict.go b/pkg/kubelet/cm/topologymanager/policy_strict.go index 9e3cc6a51e9..14849885007 100644 --- a/pkg/kubelet/cm/topologymanager/policy_strict.go +++ b/pkg/kubelet/cm/topologymanager/policy_strict.go @@ -36,9 +36,8 @@ func (p *strictPolicy) Name() string { return string(PolicyStrict) } -func (p *strictPolicy) CanAdmitPodResult(result TopologyHints) lifecycle.PodAdmitResult { - affinity := result.Affinity - if !affinity { +func (p *strictPolicy) CanAdmitPodResult(admit bool) lifecycle.PodAdmitResult { + if !admit { return lifecycle.PodAdmitResult{ Admit: false, Reason: "Topology Affinity Error",