Merge pull request #38108 from hodovska/1396877-pvc-limitrange-max

Automatic merge from submit-queue (batch tested with PRs 37846, 38619, 38108) LimitRange: modified approach for PVC max storage request enforcing Behavior was correct but with not correct error messages. This pull request creates separate approach for enforcing the max request for persistent volume claim. Additional info: https://github.com/kubernetes/kubernetes/blob/master/docs/design/admission_control_limit_range.md#enforcement-of-constraints bugzilla : https://bugzilla.redhat.com/show_bug.cgi?id=1396877

Merge pull request #38108 from hodovska/1396877-pvc-limitrange-max
b5cf713b · Kubernetes Submit Queue · GitHub · 60593467 · 755f5870 · b5cf713b
Commit b5cf713b authored Dec 12, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 12, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 2 deletions

admission.go plugin/pkg/admission/limitranger/admission.go +17 -2

No files found.
--- a/plugin/pkg/admission/limitranger/admission.go
+++ b/plugin/pkg/admission/limitranger/admission.go
@@ -279,6 +279,21 @@ func minConstraint(limitType api.LimitType, resourceName api.ResourceName, enfor
 	return nil
 }

+// maxRequestConstraint enforces the max constraint over the specified resource
+// use when specify LimitType resource doesn't recognize limit values
+func maxRequestConstraint(limitType api.LimitType, resourceName api.ResourceName, enforced resource.Quantity, request api.ResourceList) error {
+	req, reqExists := request[resourceName]
+	observedReqValue, _, enforcedValue := requestLimitEnforcedValues(req, resource.Quantity{}, enforced)
+
+	if !reqExists {
+		return fmt.Errorf("maximum %s usage per %s is %s.  No request is specified.", resourceName, limitType, enforced.String())
+	}
+	if observedReqValue > enforcedValue {
+		return fmt.Errorf("maximum %s usage per %s is %s, but request is %s.", resourceName, limitType, enforced.String(), req.String())
+	}
+	return nil
+}
+
 // maxConstraint enforces the max constraint over the specified resource
 func maxConstraint(limitType api.LimitType, resourceName api.ResourceName, enforced resource.Quantity, request api.ResourceList, limit api.ResourceList) error {
 	req, reqExists := request[resourceName]
@@ -415,9 +430,9 @@ func PersistentVolumeClaimLimitFunc(limitRange *api.LimitRange, pvc *api.Persist
 				}
 			}
 			for k, v := range limit.Max {
-				// reverse usage of maxConstraint. We want to enforce the max of the LimitRange against what
+				// We want to enforce the max of the LimitRange against what
 				// the user requested.
-				if err := maxConstraint(limitType, k, v, api.ResourceList{}, pvc.Spec.Resources.Requests); err != nil {
+				if err := maxRequestConstraint(limitType, k, v, pvc.Spec.Resources.Requests); err != nil {
 					errs = append(errs, err)
 				}
 			}