feat: support archive logs in resource template. Fixes:#9900 (#13933)

Signed-off-by: shuangkun <[email protected]>

cmd/argoexec/commands/resource.go

@@ -34,7 +34,9 @@ func execResource(ctx context.Context, action string) error {
 
 	wfExecutor.InitializeOutput(bgCtx)
 	defer wfExecutor.HandleError(bgCtx)
-	defer wfExecutor.FinalizeOutput(bgCtx) //Ensures the LabelKeyReportOutputsCompleted is set to true.
+	if !wfExecutor.Template.SaveLogsAsArtifact() {
+		defer wfExecutor.FinalizeOutput(bgCtx) //Ensures the LabelKeyReportOutputsCompleted is set to true.
+	}
 	err := wfExecutor.StageFiles()
 	if err != nil {
 		wfExecutor.AddError(err)

cmd/argoexec/commands/wait.go

@@ -45,6 +45,15 @@ func waitContainer(ctx context.Context) error {
 		wfExecutor.AddError(err)
 	}
 
+	if wfExecutor.Template.Resource != nil {
+		// Save log artifacts for resource template
+		err = wfExecutor.ReportOutputsLogs(bgCtx)
+		if err != nil {
+			wfExecutor.AddError(err)
+		}
+		return wfExecutor.HasError()
+	}
+
 	// Capture output script result
 	err = wfExecutor.CaptureScriptResult(bgCtx)
 	if err != nil {

test/e2e/artifacts_test.go

@@ -718,6 +718,48 @@ func (s *ArtifactsSuite) TestMainLog() {
 	})
 }
 
+func (s *ArtifactsSuite) TestResourceLog() {
+	s.Run("Basic", func() {
+		s.Given().
+			Workflow(`
+apiVersion: argoproj.io/v1alpha1
+kind: Workflow
+metadata:
+  generateName: resource-tmpl-wf-
+spec:
+  entrypoint: main
+  templates:
+    - name: main
+      resource:
+        action: create
+        successCondition: status.phase == Succeeded
+        setOwnerReference: true
+        manifest: |
+          apiVersion: argoproj.io/v1alpha1
+          kind: Workflow
+          metadata:
+            generateName: hello-world-
+            labels:
+              workflows.argoproj.io/test: "true"
+          spec:
+            entrypoint: whalesay
+            templates:
+              - name: whalesay
+                container:
+                  image: argoproj/argosay:v2
+                  command: [sh, -c]
+                  args: [echo, ":) Hello Argo!"]
+`).
+			When().
+			SubmitWorkflow().
+			WaitForWorkflow(fixtures.ToBeSucceeded).
+			Then().
+			ExpectArtifact("-", "main-logs", "my-bucket", func(t *testing.T, object minio.ObjectInfo, err error) {
+				require.NoError(t, err)
+			})
+	})
+}
+
 func (s *ArtifactsSuite) TestContainersetLogs() {
 	s.Run("Basic", func() {
 		s.Given().

workflow/controller/workflowpod.go

@@ -212,10 +212,11 @@ func (woc *wfOperationCtx) createWorkflowPod(ctx context.Context, nodeName strin
 		return nil, err
 	}
 
-	if tmpl.GetType() != wfv1.TemplateTypeResource && tmpl.GetType() != wfv1.TemplateTypeData {
-		// we do not need the wait container for resource templates because
+	if (tmpl.GetType() != wfv1.TemplateTypeResource && tmpl.GetType() != wfv1.TemplateTypeData) || (tmpl.GetType() == wfv1.TemplateTypeResource && tmpl.SaveLogsAsArtifact()) {
+		// we do not need the wait container for data templates because
 		// argoexec runs as the main container and will perform the job of
 		// annotating the outputs or errors, making the wait container redundant.
+		// for resource template, add a wait container to collect logs.
 		waitCtr := woc.newWaitContainer(tmpl)
 		pod.Spec.Containers = append(pod.Spec.Containers, *waitCtr)
 	}

workflow/executor/executor.go

@@ -849,6 +849,16 @@ func (we *WorkflowExecutor) ReportOutputs(ctx context.Context, artifacts []wfv1.
 	return we.reportResult(ctx, wfv1.NodeResult{Outputs: outputs})
 }
 
+// ReportOutputsLogs updates the WorkflowTaskResult log fields
+func (we *WorkflowExecutor) ReportOutputsLogs(ctx context.Context) error {
+	var outputs wfv1.Outputs
+	artifacts := wfv1.Artifacts{}
+	logArtifacts := we.SaveLogs(ctx)
+	artifacts = append(artifacts, logArtifacts...)
+	outputs.Artifacts = artifacts
+	return we.reportResult(ctx, wfv1.NodeResult{Outputs: &outputs})
+}
+
 func (we *WorkflowExecutor) reportResult(ctx context.Context, result wfv1.NodeResult) error {
 	return retryutil.OnError(wait.Backoff{
 		Duration: time.Second,