fix(pods): set resources from script templates (#6450)

Signed-off-by: AntoineDao <antoinedao1@gmail.com>

workflow/controller/workflowpod.go

@@ -149,9 +149,18 @@ func (woc *wfOperationCtx) createWorkflowPod(ctx context.Context, nodeName strin
 		if isResourcesSpecified(woc.controller.Config.MainContainer) {
 			c.Resources = *woc.controller.Config.MainContainer.Resources.DeepCopy()
 		}
-		// Container resources in workflow spec takes precedence over the main container's configuration in controller.
-		if isResourcesSpecified(tmpl.Container) && tmpl.Container.Name == common.MainContainerName {
-			c.Resources = *tmpl.Container.Resources.DeepCopy()
+		// Template resources inv workflow spec takes precedence over the main container's configuration in controller
+		switch tmpl.GetType() {
+		case wfv1.TemplateTypeContainer:
+			if isResourcesSpecified(tmpl.Container) && tmpl.Container.Name == common.MainContainerName {
+				c.Resources = *tmpl.Container.Resources.DeepCopy()
+			}
+		case wfv1.TemplateTypeScript:
+			if isResourcesSpecified(&tmpl.Script.Container) {
+				c.Resources = *tmpl.Script.Resources.DeepCopy()
+			}
+		case wfv1.TemplateTypeContainerSet:
+
 		}
 		mainCtrs[i] = c
 	}

workflow/controller/workflowpod_test.go

@@ -39,6 +39,28 @@ func newWoc(wfs ...wfv1.Workflow) *wfOperationCtx {
 	return woc
 }
 
+var scriptWf = `
+apiVersion: argoproj.io/v1alpha1
+kind: Workflow
+metadata:
+  name: hello-world
+spec:
+  entrypoint: whalesay
+  templates:
+  - name: script-with-input-artifact
+    inputs:
+      artifacts:
+      - name: kubectl
+        path: /bin/kubectl
+        http:
+          url: https://storage.googleapis.com/kubernetes-release/release/v1.8.0/bin/linux/amd64/kubectl
+    script:
+      image: alpine:latest
+      command: [sh]
+      source: |
+        ls /bin/kubectl
+`
+
 var scriptTemplateWithInputArtifact = `
 name: script-with-input-artifact
 inputs:
@@ -1287,6 +1309,22 @@ func TestMainContainerCustomization(t *testing.T) {
 	}
 	pod, _ = woc.createWorkflowPod(ctx, wf.Name, []apiv1.Container{*mainCtr}, &wf.Spec.Templates[0], &createWorkflowPodOpts{})
 	assert.Equal(t, "0.100", pod.Spec.Containers[1].Resources.Limits.Cpu().AsDec().String())
+
+	// If script template has limits then they take precedence over config in controller
+	wf = wfv1.MustUnmarshalWorkflow(scriptWf)
+	woc = newWoc(*wf)
+	woc.controller.Config.MainContainer = mainCtrSpec
+	mainCtr = &woc.execWf.Spec.Templates[0].Script.Container
+	wf.Spec.Templates[0].Script.Container.Resources = apiv1.ResourceRequirements{
+		Limits: apiv1.ResourceList{
+			apiv1.ResourceCPU:    resource.MustParse("1"),
+			apiv1.ResourceMemory: resource.MustParse("123Mi"),
+		},
+	}
+	pod, _ = woc.createWorkflowPod(ctx, wf.Name, []apiv1.Container{*mainCtr}, &wf.Spec.Templates[0], &createWorkflowPodOpts{})
+	assert.Equal(t, "1", pod.Spec.Containers[1].Resources.Limits.Cpu().AsDec().String())
+	assert.Equal(t, "128974848", pod.Spec.Containers[1].Resources.Limits.Memory().AsDec().String())
+
 }
 
 func TestIsResourcesSpecified(t *testing.T) {