github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #24379 from huang195/quota_fixes

Browse Source 
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
This commit is contained in:
k8s-merge-robot 2016-04-17 08:02:47 -07:00
commit 9e7ed221ed
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/quota/generic/evaluator.go
View File

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