fix: Resource requests on init/wait containers. Fixes #6809 (#6879)

Signed-off-by: zorulo <artist.swimmer.cheng@gmail.com>
argoproj · Oct 7, 2021 · 4d38404 · 4d38404
1 parent cca4792
commit 4d38404
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/workflow/controller/workflowpod.go b/workflow/controller/workflowpod.go
@@ -700,7 +700,7 @@ func (woc *wfOperationCtx) newExecContainer(name string, tmpl *wfv1.Template) *a
 }
 
 func isResourcesSpecified(ctr *apiv1.Container) bool {
-	return ctr != nil && len(ctr.Resources.Limits) != 0
+	return ctr != nil && (len(ctr.Resources.Limits) != 0 || len(ctr.Resources.Requests) != 0)
 }
 
 // addMetadata applies metadata specified in the template

diff --git a/workflow/controller/workflowpod_test.go b/workflow/controller/workflowpod_test.go
@@ -1399,13 +1399,36 @@ func TestIsResourcesSpecified(t *testing.T) {
 	mainCtr.Resources = apiv1.ResourceRequirements{Limits: apiv1.ResourceList{}}
 	assert.False(t, isResourcesSpecified(mainCtr))
 
+	// only limits
 	mainCtr.Resources = apiv1.ResourceRequirements{
 		Limits: apiv1.ResourceList{
 			apiv1.ResourceCPU:    resource.MustParse("0.900"),
 			apiv1.ResourceMemory: resource.MustParse("512Mi"),
 		},
 	}
 	assert.True(t, isResourcesSpecified(mainCtr))
+
+	// only requests
+	mainCtr.Resources = apiv1.ResourceRequirements{
+		Requests: apiv1.ResourceList{
+			apiv1.ResourceCPU:    resource.MustParse("0.250"),
+			apiv1.ResourceMemory: resource.MustParse("64Mi"),
+		},
+	}
+	assert.True(t, isResourcesSpecified(mainCtr))
+
+	// both requests and limits
+	mainCtr.Resources = apiv1.ResourceRequirements{
+		Requests: apiv1.ResourceList{
+			apiv1.ResourceCPU:    resource.MustParse("0.250"),
+			apiv1.ResourceMemory: resource.MustParse("64Mi"),
+		},
+		Limits: apiv1.ResourceList{
+			apiv1.ResourceCPU:    resource.MustParse("0.900"),
+			apiv1.ResourceMemory: resource.MustParse("512Mi"),
+		},
+	}
+	assert.True(t, isResourcesSpecified(mainCtr))
 }
 
 var helloWindowsWf = `