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

Check the correct value of Quantity in GetResourceRequest

Browse Source
This commit is contained in:
Ted Yu 2019-07-01 06:45:26 +08:00 committed by Ted Yu
parent 82bfa667ed
commit 2dca643ca1
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/api/v1/resource/helpers.go
View File

@ -86,8 +86,10 @@ func GetResourceRequest(pod *v1.Pod, resource v1.ResourceName) int64 {
// take max_resource(sum_pod, any_init_container)
for _, container := range pod.Spec.InitContainers {
if rQuantity, ok := container.Resources.Requests[resource]; ok {
if resource == v1.ResourceCPU && rQuantity.MilliValue() > totalResources {
totalResources = rQuantity.MilliValue()
if resource == v1.ResourceCPU {
if rQuantity.MilliValue() > totalResources {
totalResources = rQuantity.MilliValue()
}
} else if rQuantity.Value() > totalResources {
totalResources = rQuantity.Value()
}

25
pkg/api/v1/resource/helpers_test.go
View File

@ -63,6 +63,31 @@ func TestDefaultResourceHelpers(t *testing.T) {
}
}
func TestGetResourceRequest(t *testing.T) {
cases := []struct {
pod *v1.Pod
res v1.ResourceName
expectedValue int64
expectedError error
}{
{
pod: getPod("foo", "9", "", "", ""),
res: v1.ResourceCPU,
expectedValue: 9000,
},
{
pod: getPod("foo", "", "", "90Mi", ""),
res: v1.ResourceMemory,
expectedValue: 94371840,
},
}
as := assert.New(t)
for idx, tc := range cases {
actual := GetResourceRequest(tc.pod, tc.res)
as.Equal(actual, tc.expectedValue, "expected test case [%d] to return %q; got %q instead", idx, tc.expectedValue, actual)
}
}
func TestExtractResourceValue(t *testing.T) {
cases := []struct {
fs *v1.ResourceFieldSelector