Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Do not set container requests in limit ranger for Kube 1.0 #8875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 29, 2015
Merged

Do not set container requests in limit ranger for Kube 1.0 #8875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions plugin/pkg/admission/limitranger/admission.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 2 additions & 5 deletions plugin/pkg/admission/limitranger/admission_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 {
Expand Down