Skip to content

Commit

Permalink
Revert "Revert "[orchestration] properly collect 0 values" (#11184)"
Browse files Browse the repository at this point in the history
This reverts commit c65d541.
  • Loading branch information
nam committed Mar 7, 2022
1 parent c65d541 commit ceca2b8
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -225,27 +225,12 @@ func convertResourceRequirements(rq corev1.ResourceRequirements, containerName s
setLimits := false
limits := map[string]int64{}

cpuLimit := rq.Limits.Cpu()
if !cpuLimit.IsZero() {
limits[corev1.ResourceCPU.String()] = cpuLimit.MilliValue()
for t, v := range rq.Limits {
limits[t.String()] = v.Value()
setLimits = true
}

memLimit := rq.Limits.Memory()
if !memLimit.IsZero() {
limits[corev1.ResourceMemory.String()] = memLimit.Value()
setLimits = true
}

cpuRequest := rq.Requests.Cpu()
if !cpuRequest.IsZero() {
requests[corev1.ResourceCPU.String()] = cpuRequest.MilliValue()
setRequests = true
}

memRequest := rq.Requests.Memory()
if !memRequest.IsZero() {
requests[corev1.ResourceMemory.String()] = memRequest.Value()
for t, v := range rq.Requests {
requests[t.String()] = v.Value()
setRequests = true
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,22 @@ func TestConvertResourceRequirements(t *testing.T) {
},
expected: nil,
},
"0 ResourceRequirements set": {
input: v1.Container{
Name: "test",
Resources: v1.ResourceRequirements{
// 1024 = 1Ki
Limits: map[v1.ResourceName]resource.Quantity{v1.ResourceMemory: resource.MustParse("0"), v1.ResourceCPU: resource.MustParse("550Mi")},
Requests: map[v1.ResourceName]resource.Quantity{v1.ResourceMemory: resource.MustParse("0")}, // explicitly set the "0" value, that means if not set, it will not be in the map
},
},
expected: &model.ResourceRequirements{
Limits: map[string]int64{v1.ResourceCPU.String(): 576716800, v1.ResourceMemory.String(): 0},
Requests: map[string]int64{v1.ResourceMemory.String(): 0},
Name: "test",
Type: model.ResourceRequirementsType_container,
},
},
"only mem set": {
input: v1.Container{
Name: "test",
Expand Down

0 comments on commit ceca2b8

Please sign in to comment.