feat: override task timeout in pipelineruns

Signed-off-by: Vibhav Bobade <[email protected]>

Author: waveywaves

config/300-crds/300-pipeline.yaml

@@ -349,7 +349,7 @@ spec:
                         x-kubernetes-preserve-unknown-fields: true
                       timeout:
                         description: |-
-                          Time after which the TaskRun times out. Defaults to 1 hour.
+                          Duration after which the TaskRun times out. Defaults to 1 hour.
                           Refer Go's ParseDuration documentation for expected format: https://golang.org/pkg/time/#ParseDuration
                         type: string
                       when:
@@ -794,7 +794,7 @@ spec:
                         x-kubernetes-preserve-unknown-fields: true
                       timeout:
                         description: |-
-                          Time after which the TaskRun times out. Defaults to 1 hour.
+                          Duration after which the TaskRun times out. Defaults to 1 hour.
                           Refer Go's ParseDuration documentation for expected format: https://golang.org/pkg/time/#ParseDuration
                         type: string
                       when:
@@ -1126,7 +1126,7 @@ spec:
                         x-kubernetes-preserve-unknown-fields: true
                       timeout:
                         description: |-
-                          Time after which the TaskRun times out. Defaults to 1 hour.
+                          Duration after which the TaskRun times out. Defaults to 1 hour.
                           Refer Go's ParseDuration documentation for expected format: https://golang.org/pkg/time/#ParseDuration
                         type: string
                       when:
@@ -1465,7 +1465,7 @@ spec:
                         x-kubernetes-preserve-unknown-fields: true
                       timeout:
                         description: |-
-                          Time after which the TaskRun times out. Defaults to 1 hour.
+                          Duration after which the TaskRun times out. Defaults to 1 hour.
                           Refer Go's ParseDuration documentation for expected format: https://golang.org/pkg/time/#ParseDuration
                         type: string
                       when:

config/300-crds/300-pipelinerun.yaml

@@ -1419,6 +1419,11 @@ spec:
                             x-kubernetes-preserve-unknown-fields: true
                       taskServiceAccountName:
                         type: string
+                      timeout:
+                        description: |-
+                          Duration after which the TaskRun times out.
+                          Refer Go's ParseDuration documentation for expected format: https://golang.org/pkg/time/#ParseDuration
+                        type: string
                   x-kubernetes-list-type: atomic
                 timeout:
                   description: |-
@@ -3901,6 +3906,13 @@ spec:
                               description: The name of the Step to override.
                               type: string
                         x-kubernetes-list-type: atomic
+                      timeout:
+                        description: |-
+                          Duration after which the TaskRun times out. Overrides the timeout specified
+                          on the Task's spec if specified. Takes lower precedence to PipelineRun's
+                          `spec.timeouts.tasks`
+                          Refer Go's ParseDuration documentation for expected format: https://golang.org/pkg/time/#ParseDuration
+                        type: string
                   x-kubernetes-list-type: atomic
                 taskRunTemplate:
                   description: TaskRunTemplate represent template of taskrun

docs/pipeline-api.md

@@ -3322,6 +3322,21 @@ Kubernetes core/v1.ResourceRequirements
 <p>Compute resources to use for this TaskRun</p>
 </td>
 </tr>
+<tr>
+<td>
+<code>timeout</code><br/>
+<em>
+<a href="https://godoc.org/k8s.io/apimachinery/pkg/apis/meta/v1#Duration">
+Kubernetes meta/v1.Duration
+</a>
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>Time after which the TaskRun times out.
+Refer Go&rsquo;s ParseDuration documentation for expected format: <a href="https://golang.org/pkg/time/#ParseDuration">https://golang.org/pkg/time/#ParseDuration</a></p>
+</td>
+</tr>
 </tbody>
 </table>
 <h3 id="tekton.dev/v1.PipelineTaskRunTemplate">PipelineTaskRunTemplate

docs/pipelineruns.md

@@ -951,6 +951,7 @@ spec:
       podTemplate:
         nodeSelector:
           disktype: ssd
+      timeout: "1h30m"
 ```
 {{% /tab %}}
 
@@ -968,12 +969,16 @@ spec:
       taskPodTemplate:
         nodeSelector:
           disktype: ssd
+      timeout: "1h30m"
 ```
 {{% /tab %}}
 {{< /tabs >}}
 
 If used with this `Pipeline`,  `build-task` will use the task specific `PodTemplate` (where `nodeSelector` has `disktype` equal to `ssd`)
-along with `securityContext` from the `pipelineRun.spec.podTemplate`.
+along with `securityContext` from the `pipelineRun.spec.podTemplate`. The task will also have a specific timeout of 1 hour and 30 minutes. This overrides any existing timeout already defined by the pipelineTask as well, though the specified `pipelineRun.spec.timeouts.tasks` will still take precedence.
+
+For more details on timeout overrides, precedence rules, validation, and practical examples, see [Overriding Individual Task Timeouts](#overriding-individual-task-timeouts) in the failure timeout section.
+
 `PipelineTaskRunSpec` may also contain `StepSpecs` and `SidecarSpecs`; see
 [Overriding `Task` `Steps` and `Sidecars`](./taskruns.md#overriding-task-steps-and-sidecars) for more information.
 
@@ -1414,6 +1419,36 @@ The global default timeout is set to 60 minutes when you first install Tekton. Y
 a different global default timeout value using the `default-timeout-minutes` field in
 [`config/config-defaults.yaml`](./../config/config-defaults.yaml).
 
+#### Overriding Individual Task Timeouts
+
+You can use `taskRunSpecs` to override individual task timeouts at runtime without modifying the Pipeline definition.
+
+**Timeout Precedence (highest to lowest):**
+1. `taskRunSpecs[].timeout` - runtime override per task
+2. `pipeline.spec.tasks[].timeout` - Pipeline spec timeout
+3. `timeouts.tasks` or `timeouts.pipeline` - PipelineRun constraints  
+4. Global default timeout
+
+```yaml
+apiVersion: tekton.dev/v1
+kind: PipelineRun
+spec:
+  timeouts:
+    pipeline: "10m"    # 3. PipelineRun constraint
+  pipelineSpec:
+    tasks:
+    - name: task-a
+      timeout: "8m"     # 2. Pipeline spec timeout
+      taskSpec: { ... }
+    - name: task-b  
+      taskSpec: { ... } # 4. Uses global default (60m)
+  taskRunSpecs:
+  - pipelineTaskName: task-a
+    timeout: "5m"       # 1. Highest priority - overrides 8m Pipeline timeout
+```
+
+**Note:** `taskRunSpecs` timeouts cannot exceed pipeline-level constraints and will fail validation if they do.
+
 Example timeouts usages are as follows:
 
 Combination 1: Set the timeout for the entire `pipeline` and reserve a portion of it for `tasks`.

docs/pipelines.md

@@ -1206,6 +1206,8 @@ format. For example, valid values are `1h30m`, `1h`, `1m`, and `60s`.
 For example, if the `PipelineRun` sets `timeouts.pipeline = 1h` and the `Pipeline` sets `tasks[0].timeout = 3h`, the task will still timeout after `1h`.
 See [`PipelineRun - Configuring a failure timeout`](pipelineruns.md#configuring-a-failure-timeout) for details.
 
+**Note:** Task timeouts specified in the Pipeline can be overridden at runtime using the [`taskRunSpecs`](pipelineruns.md#overriding-individual-task-timeouts) field in the PipelineRun. This provides flexibility to adjust timeouts for specific execution contexts without modifying the Pipeline definition.
+
 In the example below, the `build-the-image` `Task` is configured to time out after 90 seconds:
 
 ```yaml

examples/v1/pipelineruns/pipelinerun-with-task-timeout-override.yaml

@@ -0,0 +1,53 @@
+apiVersion: tekton.dev/v1
+kind: Task
+metadata:
+  name: sleep-task
+spec:
+  steps:
+  - name: sleep-long
+    image: alpine:latest
+    script: |
+      #!/bin/sh
+      sleep 10
+---
+apiVersion: tekton.dev/v1
+kind: Task
+metadata:
+  name: verify-task
+spec:
+  steps:
+  - name: verify-completion
+    image: alpine:latest
+    script: |
+      #!/bin/sh
+      echo "- Pipeline task timeout: 60s (defined in pipeline spec)"
+      echo "- TaskRunSpecs override: 20s (defined in pipelinerun spec)"
+      echo "- Actual task duration: 10s (within 20s override timeout)"
+---
+apiVersion: tekton.dev/v1
+kind: Pipeline
+metadata:
+  name: taskrun-timeout-override
+spec:
+  tasks:
+  - name: long-running-task
+    taskRef:
+      name: sleep-task
+      kind: Task
+    timeout: "60s"  # pipeline task timeout (will be overridden to 20s)
+  - name: verify-timeout
+    taskRef:
+      name: verify-task
+      kind: Task
+    runAfter: ["long-running-task"]
+---
+apiVersion: tekton.dev/v1
+kind: PipelineRun
+metadata:
+  name: taskrun-timeout-override
+spec:
+  pipelineRef:
+    name: taskrun-timeout-override
+  taskRunSpecs:
+  - pipelineTaskName: long-running-task
+    timeout: "20s"      # 20s timeout (can't actually test with a timeout lesser than  10s else the task fails)

pkg/apis/pipeline/v1/openapi_generated.go

@@ -237,7 +237,7 @@ type PipelineTask struct {
 	// +listType=atomic
 	Workspaces []WorkspacePipelineTaskBinding `json:"workspaces,omitempty"`
 
-	// Time after which the TaskRun times out. Defaults to 1 hour.
+	// Duration after which the TaskRun times out. Defaults to 1 hour.
 	// Refer Go's ParseDuration documentation for expected format: https://golang.org/pkg/time/#ParseDuration
 	// +optional
 	Timeout *metav1.Duration `json:"timeout,omitempty"`

pkg/apis/pipeline/v1/pipeline_types.go

@@ -1415,7 +1415,7 @@ func TestPipelineSpec_Validate_Failure(t *testing.T) {
 			if err == nil {
 				t.Errorf("PipelineSpec.Validate() did not return error for invalid pipelineSpec")
 			}
-			if d := cmp.Diff(tt.expectedError.Error(), err.Error(), cmpopts.IgnoreUnexported(apis.FieldError{})); d != "" {
+			if d := cmp.Diff(tt.expectedError.Error(), err.Error()); d != "" {
 				t.Errorf("PipelineSpec.Validate() errors diff %s", diff.PrintWantGot(d))
 			}
 		})

pkg/apis/pipeline/v1/pipeline_validation_test.go

@@ -656,6 +656,13 @@ type PipelineTaskRunSpec struct {
 
 	// Compute resources to use for this TaskRun
 	ComputeResources *corev1.ResourceRequirements `json:"computeResources,omitempty"`
+
+	// Duration after which the TaskRun times out. Overrides the timeout specified
+	// on the Task's spec if specified. Takes lower precedence to PipelineRun's
+	// `spec.timeouts.tasks`
+	// Refer Go's ParseDuration documentation for expected format: https://golang.org/pkg/time/#ParseDuration
+	// +optional
+	Timeout *metav1.Duration `json:"timeout,omitempty"`
 }
 
 // GetTaskRunSpec returns the task specific spec for a given
@@ -678,6 +685,7 @@ func (pr *PipelineRun) GetTaskRunSpec(pipelineTaskName string) PipelineTaskRunSp
 			s.SidecarSpecs = task.SidecarSpecs
 			s.Metadata = task.Metadata
 			s.ComputeResources = task.ComputeResources
+			s.Timeout = task.Timeout
 		}
 	}
 	return s