From bd17fa002cb70e7a564ace386215db3df3213da3 Mon Sep 17 00:00:00 2001 From: derekwaynecarr Date: Fri, 6 Nov 2015 15:10:35 -0500 Subject: [PATCH] Improve quota error messages --- plugin/pkg/admission/resourcequota/admission.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/pkg/admission/resourcequota/admission.go b/plugin/pkg/admission/resourcequota/admission.go index 890b60de32f..813dcac34ae 100644 --- a/plugin/pkg/admission/resourcequota/admission.go +++ b/plugin/pkg/admission/resourcequota/admission.go @@ -217,7 +217,7 @@ func IncrementUsage(a admission.Attributes, status *api.ResourceQuotaStatus, cli delta, err := resourcequotacontroller.PodRequests(pod, resourceName) if err != nil { - return false, fmt.Errorf("must make a non-zero request for %s since it is tracked by quota.", resourceName) + return false, fmt.Errorf("%s is limited by quota, must make explicit request.", resourceName) } // if this operation is an update, we need to find the delta usage from the previous state @@ -252,7 +252,7 @@ func IncrementUsage(a admission.Attributes, status *api.ResourceQuotaStatus, cli } if newUsageValue > hardUsageValue { - errs = append(errs, fmt.Errorf("unable to admit pod without exceeding quota for resource %s: limited to %s but require %s to succeed.", resourceName, hard.String(), newUsage.String())) + errs = append(errs, fmt.Errorf("%s quota is %s, current usage is %s, requesting %s.", resourceName, hard.String(), used.String(), delta.String())) dirty = false } else { status.Used[resourceName] = *newUsage