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

Merge pull request #14154 from hurf/quantity_add

Browse Source 
Remove type validation in resource.Quantity.Add
This commit is contained in:
Brian Grant
2015-09-24 18:28:01 -07:00
parent 26fe0823d5 5cc909afe7
commit 727604cb9b
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/resource/quantity.go
View File

@@ -323,9 +323,6 @@ func (q *Quantity) Cmp(y Quantity) int {
} }
func (q *Quantity) Add(y Quantity) error { func (q *Quantity) Add(y Quantity) error {
if q.Format != y.Format {
return fmt.Errorf("format mismatch: %v vs. %v", q.Format, y.Format)
}
q.Amount.Add(q.Amount, y.Amount) q.Amount.Add(q.Amount, y.Amount)
return nil return nil
} }

8
plugin/pkg/admission/resourcequota/admission_test.go
View File

@@ -127,6 +127,14 @@ func TestIncrementUsagePodResources(t *testing.T) {
hard: resource.MustParse("500Mi"), hard: resource.MustParse("500Mi"),
expectedError: true, expectedError: true,
}, },
{
testName: "memory-not-allowed-with-different-format",
existing: validPod("a", 1, getResourceRequirements(getResourceList("", "100M"), getResourceList("", ""))),
input: validPod("b", 1, getResourceRequirements(getResourceList("", "450Mi"), getResourceList("", ""))),
resourceName: api.ResourceMemory,
hard: resource.MustParse("500Mi"),
expectedError: true,
},
{ {
testName: "memory-no-request", testName: "memory-no-request",
existing: validPod("a", 1, getResourceRequirements(getResourceList("", "100Mi"), getResourceList("", ""))), existing: validPod("a", 1, getResourceRequirements(getResourceList("", "100Mi"), getResourceList("", ""))),