github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve quota error messages

pull/6/head
derekwaynecarr 2015-11-06 15:10:35 -05:00
parent 1407fd2071
commit bd17fa002c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/pkg/admission/resourcequota/admission.go
View File

@ -217,7 +217,7 @@ func IncrementUsage(a admission.Attributes, status *api.ResourceQuotaStatus, cli
delta, err := resourcequotacontroller.PodRequests(pod, resourceName) delta, err := resourcequotacontroller.PodRequests(pod, resourceName)
if err != nil { 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 // 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 { 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 dirty = false
} else { } else {
status.Used[resourceName] = *newUsage status.Used[resourceName] = *newUsage