From f796cc335d715efffba6d369fd51f6b1df469de7 Mon Sep 17 00:00:00 2001 From: derekwaynecarr Date: Tue, 7 Jun 2016 12:08:08 -0400 Subject: [PATCH] Align quota BestEffort scope with recent changes --- pkg/quota/evaluator/core/pods.go | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkg/quota/evaluator/core/pods.go b/pkg/quota/evaluator/core/pods.go index 27a6ce83c8..9fa480b797 100644 --- a/pkg/quota/evaluator/core/pods.go +++ b/pkg/quota/evaluator/core/pods.go @@ -172,16 +172,7 @@ func PodMatchesScopeFunc(scope api.ResourceQuotaScope, object runtime.Object) bo } func isBestEffort(pod *api.Pod) bool { - // TODO: when we have request/limits on a pod scope, we need to revisit this - for _, container := range pod.Spec.Containers { - qosPerResource := util.GetQoS(&container) - for _, qos := range qosPerResource { - if util.BestEffort == qos { - return true - } - } - } - return false + return util.GetPodQos(pod) == util.BestEffort } func isTerminating(pod *api.Pod) bool {