fix: correct cpu resource limit

caicloud · Nov 3, 2020 · 2d70c89 · 2d70c89
1 parent d08b795
commit 2d70c89
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/pkg/workflow/workload/pod/builder.go b/pkg/workflow/workload/pod/builder.go
@@ -1013,7 +1013,11 @@ func applyResourceRequirements(containers []corev1.Container, requirements *core
 				if common.OnlyCustomContainer(c.Name) {
 					c.Resources.Limits[k] = v
 				} else {
-					c.Resources.Limits[k] = zeroQuantity
+					if k == corev1.ResourceCPU {
+						c.Resources.Limits[k] = cscCPURequest
+					} else {
+						c.Resources.Limits[k] = zeroQuantity
+					}
 				}
 			}
 		}

diff --git a/pkg/workflow/workload/pod/builder_test.go b/pkg/workflow/workload/pod/builder_test.go
@@ -655,7 +655,7 @@ func Test_applyResourceRequirements_cpu_format(t *testing.T) {
 	}
 	updated := applyResourceRequirements(containers, requirements, true, 50)
 	got, err := json.Marshal(updated)
-	const expected = `[{"name":"w1","resources":{"limits":{"cpu":"100m","memory":"128Mi"},"requests":{"cpu":"50m","memory":"128Mi"}}},{"name":"csc-c1","resources":{"limits":{"cpu":"0","memory":"0"},"requests":{"cpu":"50m","memory":"0"}}}]`
+	const expected = `[{"name":"w1","resources":{"limits":{"cpu":"100m","memory":"128Mi"},"requests":{"cpu":"50m","memory":"128Mi"}}},{"name":"csc-c1","resources":{"limits":{"cpu":"50m","memory":"0"},"requests":{"cpu":"50m","memory":"0"}}}]`
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -942,7 +942,7 @@ func TestApplyResourceRequirements(t *testing.T) {
 							corev1.ResourceMemory: resource.MustParse("0"),
 						},
 						Limits: corev1.ResourceList{
-							corev1.ResourceCPU:    resource.MustParse("0"),
+							corev1.ResourceCPU:    resource.MustParse("200m"),
 							corev1.ResourceMemory: resource.MustParse("0"),
 						},
 					},
@@ -955,7 +955,7 @@ func TestApplyResourceRequirements(t *testing.T) {
 							corev1.ResourceMemory: resource.MustParse("0"),
 						},
 						Limits: corev1.ResourceList{
-							corev1.ResourceCPU:    resource.MustParse("0"),
+							corev1.ResourceCPU:    resource.MustParse("200m"),
 							corev1.ResourceMemory: resource.MustParse("0"),
 						},
 					},
@@ -1021,7 +1021,7 @@ func TestApplyResourceRequirements(t *testing.T) {
 							corev1.ResourceMemory: resource.MustParse("0"),
 						},
 						Limits: corev1.ResourceList{
-							corev1.ResourceCPU:    resource.MustParse("0"),
+							corev1.ResourceCPU:    resource.MustParse("500m"),
 							corev1.ResourceMemory: resource.MustParse("0"),
 						},
 					},
@@ -1077,7 +1077,7 @@ func TestApplyResourceRequirements(t *testing.T) {
 							corev1.ResourceMemory: resource.MustParse("0"),
 						},
 						Limits: corev1.ResourceList{
-							corev1.ResourceCPU:    resource.MustParse("0"),
+							corev1.ResourceCPU:    resource.MustParse("166m"),
 							corev1.ResourceMemory: resource.MustParse("0"),
 						},
 					},
@@ -1090,7 +1090,7 @@ func TestApplyResourceRequirements(t *testing.T) {
 							corev1.ResourceMemory: resource.MustParse("0"),
 						},
 						Limits: corev1.ResourceList{
-							corev1.ResourceCPU:    resource.MustParse("0"),
+							corev1.ResourceCPU:    resource.MustParse("166m"),
 							corev1.ResourceMemory: resource.MustParse("0"),
 						},
 					},
@@ -1103,7 +1103,7 @@ func TestApplyResourceRequirements(t *testing.T) {
 							corev1.ResourceMemory: resource.MustParse("0"),
 						},
 						Limits: corev1.ResourceList{
-							corev1.ResourceCPU:    resource.MustParse("0"),
+							corev1.ResourceCPU:    resource.MustParse("166m"),
 							corev1.ResourceMemory: resource.MustParse("0"),
 						},
 					},