fix k8sapi volume check

liujiong1982 · Aug 5, 2020 · f892611 · f892611
1 parent 57bdaaf
commit f892611
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/workflow/common/util.go b/workflow/common/util.go
@@ -39,6 +39,8 @@ func FindOverlappingVolume(tmpl *wfv1.Template, path string) *apiv1.VolumeMount
 		volMounts = tmpl.Container.VolumeMounts
 	} else if tmpl.Script != nil {
 		volMounts = tmpl.Script.VolumeMounts
+	} else if tmpl.DAG != nil {
+		return
 	} else {
 		return nil
 	}

diff --git a/workflow/validate/validate.go b/workflow/validate/validate.go
@@ -1012,7 +1012,9 @@ func (ctx *templateValidationCtx) validateBaseImageOutputs(tmpl *wfv1.Template)
 		errMsg := fmt.Sprintf("%s executor does not support outputs from base image layer. must use emptyDir", ctx.ContainerRuntimeExecutor)
 		for _, out := range tmpl.Outputs.Artifacts {
 			if common.FindOverlappingVolume(tmpl, out.Path) == nil {
-				return errors.Errorf(errors.CodeBadRequest, "templates.%s.outputs.artifacts.%s: %s", tmpl.Name, out.Name, errMsg)
+				if tmpl.Container != nil || tmpl.Script != nil {
+					return errors.Errorf(errors.CodeBadRequest, "templates.%s.outputs.artifacts.%s: %s", tmpl.Name, out.Name, errMsg)
+				}
 			}
 		}
 		for _, out := range tmpl.Outputs.Parameters {
@@ -1021,7 +1023,9 @@ func (ctx *templateValidationCtx) validateBaseImageOutputs(tmpl *wfv1.Template)
 			}
 			if out.ValueFrom.Path != "" {
 				if common.FindOverlappingVolume(tmpl, out.ValueFrom.Path) == nil {
-					return errors.Errorf(errors.CodeBadRequest, "templates.%s.outputs.parameters.%s: %s", tmpl.Name, out.Name, errMsg)
+					if tmpl.Container != nil || tmpl.Script != nil {
+						return errors.Errorf(errors.CodeBadRequest, "templates.%s.outputs.parameters.%s: %s", tmpl.Name, out.Name, errMsg)
+					}
 				}
 			}
 		}