From 05f099211f9a3bc6d6ef5337112382cead77a545 Mon Sep 17 00:00:00 2001 From: derekwaynecarr Date: Wed, 27 May 2015 14:27:01 -0400 Subject: [PATCH] Do not set container.requests for v1 --- plugin/pkg/admission/limitranger/admission.go | 4 ---- plugin/pkg/admission/limitranger/admission_test.go | 7 ++----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/plugin/pkg/admission/limitranger/admission.go b/plugin/pkg/admission/limitranger/admission.go index ec6e83806b..7ff6cbb42d 100644 --- a/plugin/pkg/admission/limitranger/admission.go +++ b/plugin/pkg/admission/limitranger/admission.go @@ -145,10 +145,6 @@ func defaultContainerResourceRequirements(limitRange *api.LimitRange) api.Resour value := v.Copy() requirements.Limits[k] = *value } - for k, v := range limit.Min { - value := v.Copy() - requirements.Requests[k] = *value - } } } return requirements diff --git a/plugin/pkg/admission/limitranger/admission_test.go b/plugin/pkg/admission/limitranger/admission_test.go index 2159171834..9765509b19 100644 --- a/plugin/pkg/admission/limitranger/admission_test.go +++ b/plugin/pkg/admission/limitranger/admission_test.go @@ -84,7 +84,7 @@ func TestDefaultContainerResourceRequirements(t *testing.T) { limitRange := validLimitRange() expected := api.ResourceRequirements{ Limits: getResourceList("50m", "5Mi"), - Requests: getResourceList("25m", "1Mi"), + Requests: api.ResourceList{}, } actual := defaultContainerResourceRequirements(&limitRange) @@ -118,10 +118,7 @@ func TestMergePodResourceRequirements(t *testing.T) { api.ResourceCPU: defaultRequirements.Limits[api.ResourceCPU], api.ResourceMemory: resource.MustParse("512Mi"), }, - Requests: api.ResourceList{ - api.ResourceCPU: defaultRequirements.Requests[api.ResourceCPU], - api.ResourceMemory: defaultRequirements.Requests[api.ResourceMemory], - }, + Requests: api.ResourceList{}, } mergePodResourceRequirements(&pod, &defaultRequirements) for i := range pod.Spec.Containers {