From 6fd8a6eb691960872de1584c1a17ceda565bb3b6 Mon Sep 17 00:00:00 2001 From: Adrian Chiris Date: Mon, 4 Nov 2019 11:52:22 +0100 Subject: [PATCH] Make restricted TopologyManager policy inherit from best-effort policy These policies only differ on whether they admit the pod or not when a TopologyHint is preferred or not. As such, the restricted policy should simply inherit whatever it can from the best effort policy and only overwrite what is necessary. This does not matter for now, but will become important when we add a new 'Merge()' abstraction to a Policy later on. --- pkg/kubelet/cm/topologymanager/policy_restricted.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/cm/topologymanager/policy_restricted.go b/pkg/kubelet/cm/topologymanager/policy_restricted.go index 7993675ce35..531fff89550 100644 --- a/pkg/kubelet/cm/topologymanager/policy_restricted.go +++ b/pkg/kubelet/cm/topologymanager/policy_restricted.go @@ -20,7 +20,9 @@ import ( "k8s.io/kubernetes/pkg/kubelet/lifecycle" ) -type restrictedPolicy struct{} +type restrictedPolicy struct { + bestEffortPolicy +} var _ Policy = &restrictedPolicy{} @@ -29,7 +31,7 @@ const PolicyRestricted string = "restricted" // NewRestrictedPolicy returns restricted policy. func NewRestrictedPolicy() Policy { - return &restrictedPolicy{} + return &restrictedPolicy{bestEffortPolicy{}} } func (p *restrictedPolicy) Name() string {