Merge pull request #24379 from huang195/quota_fixes

Automatic merge from submit-queue minor comment and code fixes 1. Correct a comment: return value should be nil, and not true 2. Early loop break

Merge pull request #24379 from huang195/quota_fixes
9e7ed221 · k8s-merge-robot · 031c1ea3 · b6557bab · 9e7ed221
Commit 9e7ed221 authored Apr 17, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

evaluator.go pkg/quota/generic/evaluator.go +3 -2

No files found.
--- a/pkg/quota/generic/evaluator.go
+++ b/pkg/quota/generic/evaluator.go
@@ -48,8 +48,8 @@ func MatchesNoScopeFunc(scope api.ResourceQuotaScope, object runtime.Object) boo
 	return false
 }

-// ObjectCountConstraintsFunc returns true if the specified resource name is in
-// the required set of resource names
+// ObjectCountConstraintsFunc returns ConstraintsFunc that returns nil if the
+// specified resource name is in the required set of resource names
 func ObjectCountConstraintsFunc(resourceName api.ResourceName) ConstraintsFunc {
 	return func(required []api.ResourceName, item runtime.Object) error {
 		if !quota.Contains(required, resourceName) {
@@ -133,6 +133,7 @@ func (g *GenericEvaluator) Matches(resourceQuota *api.ResourceQuota, item runtim
 	for resourceName := range resourceQuota.Status.Hard {
 		if g.MatchesResource(resourceName) {
 			matchResource = true
+			break
 		}
 	}
 	// by default, no scopes matches all