Add podTemplate on Tasks

Author: dorzel

config/300-crds/300-task.yaml

@@ -284,6 +284,10 @@
           },
           "x-kubernetes-list-type": "atomic"
         },
+        "podTemplate": {
+          "description": "PodTemplate holds pod specific configuration",
+          "$ref": "#/definitions/pod.Template"
+        },
         "results": {
           "description": "Results are values that this Task can output",
           "type": "array",
@@ -2348,6 +2352,10 @@
           },
           "x-kubernetes-list-type": "atomic"
         },
+        "podTemplate": {
+          "description": "PodTemplate holds pod specific configuration",
+          "$ref": "#/definitions/pod.Template"
+        },
         "results": {
           "description": "Results are values that this Task can output",
           "type": "array",

config/300-crds/300-taskrun.yaml

@@ -19,6 +19,7 @@ package v1
 import (
 	"github.com/tektoncd/pipeline/pkg/apis/pipeline"
 	"github.com/tektoncd/pipeline/pkg/apis/pipeline/internal/checksum"
+	"github.com/tektoncd/pipeline/pkg/apis/pipeline/pod"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -122,6 +123,9 @@ type TaskSpec struct {
 	// Results are values that this Task can output
 	// +listType=atomic
 	Results []TaskResult `json:"results,omitempty"`
+
+	// PodTemplate holds pod specific configuration
+	PodTemplate *pod.PodTemplate `json:"podTemplate,omitempty"`
 }
 
 // TaskList contains a list of Task

pkg/apis/pipeline/v1/openapi_generated.go

@@ -241,11 +241,11 @@ func (b *Builder) Build(ctx context.Context, taskRun *v1.TaskRun, taskSpec v1.Ta
 		initContainers = append(initContainers, *workingDirInit)
 	}
 
-	// By default, use an empty pod template and take the one defined in the task run spec if any
+	// By default, use an empty pod template and take the merged values of the taskRun/taskSpec specs, if they are defined.
 	podTemplate := pod.Template{}
 
-	if taskRun.Spec.PodTemplate != nil {
-		podTemplate = *taskRun.Spec.PodTemplate
+	if taskRun.Spec.PodTemplate != nil || taskSpec.PodTemplate != nil {
+		podTemplate = *pod.MergePodTemplateWithDefault(taskRun.Spec.PodTemplate, taskSpec.PodTemplate)
 	}
 
 	// Resolve entrypoint for any steps that don't specify command.