Merge pull request #62275 from CaoShuFeng/resourcequota_code

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. not return 500 status code for insufficient quota This is not an unexpected error, so it should not return a 500 code, I think. @derekwaynecarr **Release note**: ```release-note NONE ```

Merge pull request #62275 from CaoShuFeng/resourcequota_code
860403da · Kubernetes Submit Queue · GitHub · ee4d90aa · 1ba70821 · 860403da
Unverified Commit 860403da authored Apr 15, 2018 by Kubernetes Submit Queue Committed by GitHub Apr 15, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

controller.go plugin/pkg/admission/resourcequota/controller.go +1 -1

No files found.
--- a/plugin/pkg/admission/resourcequota/controller.go
+++ b/plugin/pkg/admission/resourcequota/controller.go
@@ -431,7 +431,7 @@ func (e *quotaEvaluator) checkRequest(quotas []api.ResourceQuota, a admission.At
 	// if not, we reject the request.
 	hasNoCoveringQuota := limitedResourceNamesSet.Difference(restrictedResourcesSet)
 	if len(hasNoCoveringQuota) > 0 {
-		return quotas, fmt.Errorf("insufficient quota to consume: %v", strings.Join(hasNoCoveringQuota.List(), ","))
+		return quotas, admission.NewForbidden(a, fmt.Errorf("insufficient quota to consume: %v", strings.Join(hasNoCoveringQuota.List(), ",")))
 	}

 	if len(interestingQuotaIndexes) == 0 {