github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8875 from derekwaynecarr/limit_range_not_use_requests

Browse Source 
Do not set container requests in limit ranger for Kube 1.0
This commit is contained in:
Rohit Jnagal 2015-05-29 13:26:00 -07:00
commit ef3d03e6f1
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,10 +145,6 @@ func defaultContainerResourceRequirements(limitRange *api.LimitRange) api.Resour
value := v.Copy() value := v.Copy()
requirements.Limits[k] = *value requirements.Limits[k] = *value
} }
for k, v := range limit.Min {
value := v.Copy()
requirements.Requests[k] = *value
}
} }
} }
return requirements return requirements

7
plugin/pkg/admission/limitranger/admission_test.go
View File

@ -84,7 +84,7 @@ func TestDefaultContainerResourceRequirements(t *testing.T) {
limitRange := validLimitRange() limitRange := validLimitRange()
expected := api.ResourceRequirements{ expected := api.ResourceRequirements{
Limits: getResourceList("50m", "5Mi"), Limits: getResourceList("50m", "5Mi"),
Requests: getResourceList("25m", "1Mi"), Requests: api.ResourceList{},
} }
actual := defaultContainerResourceRequirements(&limitRange) actual := defaultContainerResourceRequirements(&limitRange)
@ -118,10 +118,7 @@ func TestMergePodResourceRequirements(t *testing.T) {
api.ResourceCPU: defaultRequirements.Limits[api.ResourceCPU], api.ResourceCPU: defaultRequirements.Limits[api.ResourceCPU],
api.ResourceMemory: resource.MustParse("512Mi"), api.ResourceMemory: resource.MustParse("512Mi"),
}, },
Requests: api.ResourceList{ Requests: api.ResourceList{},
api.ResourceCPU: defaultRequirements.Requests[api.ResourceCPU],
api.ResourceMemory: defaultRequirements.Requests[api.ResourceMemory],
},
} }
mergePodResourceRequirements(&pod, &defaultRequirements) mergePodResourceRequirements(&pod, &defaultRequirements)
for i := range pod.Spec.Containers { for i := range pod.Spec.Containers {