forked from kubernetes/kubernetes
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Downward API defaults resource limits to node capacity/allocatable
- Loading branch information
1 parent
6209b1b
commit 18a206a
Showing
6 changed files
with
395 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| Copyright 2016 The Kubernetes Authors All rights reserved. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package kubelet | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "k8s.io/kubernetes/pkg/api" | ||
| ) | ||
|
|
||
| // defaultPodLimitsForDownwardApi copies the input pod, and optional container, | ||
| // and applies default resource limits. it returns a copy of the input pod, | ||
| // and a copy of the input container (if specified) with default limits | ||
| // applied. if a container has no limit specified, it will default the limit to | ||
| // the node capacity. | ||
| // TODO: if/when we have pod level resources, we need to update this function | ||
| // to use those limits instead of node capacity. | ||
| func (kl *Kubelet) defaultPodLimitsForDownwardApi(pod *api.Pod, container *api.Container) (*api.Pod, *api.Container, error) { | ||
| if pod == nil { | ||
| return nil, nil, fmt.Errorf("invalid input, pod cannot be nil") | ||
| } | ||
|
|
||
| node, err := kl.getNodeAnyWay() | ||
| if err != nil { | ||
| return nil, nil, fmt.Errorf("failed to find node object, expected a node") | ||
| } | ||
| capacity := node.Status.Capacity | ||
|
|
||
| podCopy, err := api.Scheme.Copy(pod) | ||
| if err != nil { | ||
| return nil, nil, fmt.Errorf("failed to perform a deep copy of pod object: %v", err) | ||
| } | ||
| outputPod, ok := podCopy.(*api.Pod) | ||
| if !ok { | ||
| return nil, nil, fmt.Errorf("unexpected type returned from deep copy of pod object") | ||
| } | ||
| for idx := range outputPod.Spec.Containers { | ||
| mergeContainerResourceLimitsWithCapacity(&outputPod.Spec.Containers[idx], capacity) | ||
| } | ||
|
|
||
| var outputContainer *api.Container | ||
| if container != nil { | ||
| containerCopy, err := api.Scheme.DeepCopy(container) | ||
| if err != nil { | ||
| return nil, nil, fmt.Errorf("failed to perform a deep copy of container object: %v", err) | ||
| } | ||
| outputContainer, ok = containerCopy.(*api.Container) | ||
| if !ok { | ||
| return nil, nil, fmt.Errorf("unexpected type returned from deep copy of container object") | ||
| } | ||
| mergeContainerResourceLimitsWithCapacity(outputContainer, capacity) | ||
| } | ||
| return outputPod, outputContainer, nil | ||
| } | ||
|
|
||
| // mergeContainerResourceLimitsWithCapacity checks if a limit is applied for | ||
| // the container, and if not, it sets the limit based on the capacity. | ||
| func mergeContainerResourceLimitsWithCapacity(container *api.Container, | ||
| capacity api.ResourceList) { | ||
| if container.Resources.Limits == nil { | ||
| container.Resources.Limits = make(api.ResourceList) | ||
| } | ||
| for _, resource := range []api.ResourceName{api.ResourceCPU, api.ResourceMemory} { | ||
| if quantity, exists := container.Resources.Limits[resource]; !exists || quantity.IsZero() { | ||
| if cap, exists := capacity[resource]; exists { | ||
| container.Resources.Limits[resource] = *cap.Copy() | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| /* | ||
| Copyright 2016 The Kubernetes Authors All rights reserved. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package kubelet | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
|
|
||
| cadvisorapi "github.com/google/cadvisor/info/v1" | ||
| cadvisorapiv2 "github.com/google/cadvisor/info/v2" | ||
| "k8s.io/kubernetes/pkg/api" | ||
| "k8s.io/kubernetes/pkg/api/resource" | ||
| ) | ||
|
|
||
| func TestPodResourceLimitsDefaulting(t *testing.T) { | ||
| cpuCores := resource.MustParse("10") | ||
| memoryCapacity := resource.MustParse("10Gi") | ||
| tk := newTestKubelet(t, true) | ||
| tk.fakeCadvisor.On("VersionInfo").Return(&cadvisorapi.VersionInfo{}, nil) | ||
| tk.fakeCadvisor.On("MachineInfo").Return(&cadvisorapi.MachineInfo{ | ||
| NumCores: int(cpuCores.Value()), | ||
| MemoryCapacity: uint64(memoryCapacity.Value()), | ||
| }, nil) | ||
| tk.fakeCadvisor.On("ImagesFsInfo").Return(cadvisorapiv2.FsInfo{}, nil) | ||
| tk.fakeCadvisor.On("RootFsInfo").Return(cadvisorapiv2.FsInfo{}, nil) | ||
| cases := []struct { | ||
| pod *api.Pod | ||
| expected *api.Pod | ||
| }{ | ||
| { | ||
| pod: getPod("0", "0"), | ||
| expected: getPod("10", "10Gi"), | ||
| }, | ||
| { | ||
| pod: getPod("1", "0"), | ||
| expected: getPod("1", "10Gi"), | ||
| }, | ||
| { | ||
| pod: getPod("", ""), | ||
| expected: getPod("10", "10Gi"), | ||
| }, | ||
| { | ||
| pod: getPod("0", "1Mi"), | ||
| expected: getPod("10", "1Mi"), | ||
| }, | ||
| } | ||
| as := assert.New(t) | ||
| for idx, tc := range cases { | ||
| actual, _, err := tk.kubelet.defaultPodLimitsForDownwardApi(tc.pod, nil) | ||
| as.Nil(err, "failed to default pod limits: %v", err) | ||
| if !api.Semantic.DeepEqual(tc.expected, actual) { | ||
| as.Fail("test case [%d] failed. Expected: %+v, Got: %+v", idx, tc.expected, actual) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func getPod(cpuLimit, memoryLimit string) *api.Pod { | ||
| resources := api.ResourceRequirements{} | ||
| if cpuLimit != "" || memoryLimit != "" { | ||
| resources.Limits = make(api.ResourceList) | ||
| } | ||
| if cpuLimit != "" { | ||
| resources.Limits[api.ResourceCPU] = resource.MustParse(cpuLimit) | ||
| } | ||
| if memoryLimit != "" { | ||
| resources.Limits[api.ResourceMemory] = resource.MustParse(memoryLimit) | ||
| } | ||
| return &api.Pod{ | ||
| Spec: api.PodSpec{ | ||
| Containers: []api.Container{ | ||
| { | ||
| Name: "foo", | ||
| Resources: resources, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| } |
Oops, something went wrong.