github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix nil pointer that can happen if no container resources are supplied

Browse Source
This commit is contained in:
derekwaynecarr 2015-04-14 16:12:24 -04:00
parent d1bfcdf7f5
commit a50e53257d
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,7 +152,13 @@ func defaultContainerResourceRequirements(limitRange *api.LimitRange) api.Resour
// mergePodResourceRequirements merges enumerated requirements with default requirements // mergePodResourceRequirements merges enumerated requirements with default requirements
func mergePodResourceRequirements(pod *api.Pod, defaultRequirements *api.ResourceRequirements) { func mergePodResourceRequirements(pod *api.Pod, defaultRequirements *api.ResourceRequirements) {
for i := range pod.Spec.Containers { for i := range pod.Spec.Containers {
container := pod.Spec.Containers[i] container := &pod.Spec.Containers[i]
if container.Resources.Limits == nil {
container.Resources.Limits = api.ResourceList{}
}
if container.Resources.Requests == nil {
container.Resources.Requests = api.ResourceList{}
}
for k, v := range defaultRequirements.Limits { for k, v := range defaultRequirements.Limits {
_, found := container.Resources.Limits[k] _, found := container.Resources.Limits[k]
if !found { if !found {
@ -185,7 +191,7 @@ func PodLimitFunc(limitRange *api.LimitRange, pod *api.Pod) error {
maxContainerMem := int64(0) maxContainerMem := int64(0)
for i := range pod.Spec.Containers { for i := range pod.Spec.Containers {
container := pod.Spec.Containers[i] container := &pod.Spec.Containers[i]
containerCPU := container.Resources.Limits.Cpu().MilliValue() containerCPU := container.Resources.Limits.Cpu().MilliValue()
containerMem := container.Resources.Limits.Memory().Value() containerMem := container.Resources.Limits.Memory().Value()