Restore timeouts default for v1

This commit restores the pipelineRun timeouts default for v1.
tektoncd · Mar 7, 2023 · 51af078 · 51af078
1 parent 9c4d457
commit 51af078
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 1 deletion.
diff --git a/pkg/apis/pipeline/v1/pipelinerun_defaults.go b/pkg/apis/pipeline/v1/pipelinerun_defaults.go
@@ -37,7 +37,11 @@ func (pr *PipelineRun) SetDefaults(ctx context.Context) {
 func (prs *PipelineRunSpec) SetDefaults(ctx context.Context) {
 	cfg := config.FromContextOrDefaults(ctx)
 
-	if prs.Timeouts != nil && prs.Timeouts.Pipeline == nil {
+	if prs.Timeouts == nil {
+		prs.Timeouts = &TimeoutFields{}
+	}
+
+	if prs.Timeouts.Pipeline == nil {
 		prs.Timeouts.Pipeline = &metav1.Duration{Duration: time.Duration(cfg.Defaults.DefaultTimeoutMinutes) * time.Minute}
 	}
 

diff --git a/pkg/apis/pipeline/v1/pipelinerun_defaults_test.go b/pkg/apis/pipeline/v1/pipelinerun_defaults_test.go
@@ -19,6 +19,7 @@ package v1_test
 import (
 	"context"
 	"testing"
+	"time"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
@@ -37,13 +38,42 @@ func TestPipelineRunSpec_SetDefaults(t *testing.T) {
 		prs  *v1.PipelineRunSpec
 		want *v1.PipelineRunSpec
 	}{
+		{
+			desc: "timeouts is nil",
+			prs:  &v1.PipelineRunSpec{},
+			want: &v1.PipelineRunSpec{
+				TaskRunTemplate: v1.PipelineTaskRunTemplate{
+					ServiceAccountName: config.DefaultServiceAccountValue,
+				},
+				Timeouts: &v1.TimeoutFields{
+					Pipeline: &metav1.Duration{Duration: config.DefaultTimeoutMinutes * time.Minute},
+				},
+			},
+		},
+		{
+			desc: "timeouts is not nil",
+			prs: &v1.PipelineRunSpec{
+				Timeouts: &v1.TimeoutFields{},
+			},
+			want: &v1.PipelineRunSpec{
+				TaskRunTemplate: v1.PipelineTaskRunTemplate{
+					ServiceAccountName: config.DefaultServiceAccountValue,
+				},
+				Timeouts: &v1.TimeoutFields{
+					Pipeline: &metav1.Duration{Duration: config.DefaultTimeoutMinutes * time.Minute},
+				},
+			},
+		},
 		{
 			desc: "pod template is nil",
 			prs:  &v1.PipelineRunSpec{},
 			want: &v1.PipelineRunSpec{
 				TaskRunTemplate: v1.PipelineTaskRunTemplate{
 					ServiceAccountName: config.DefaultServiceAccountValue,
 				},
+				Timeouts: &v1.TimeoutFields{
+					Pipeline: &metav1.Duration{Duration: config.DefaultTimeoutMinutes * time.Minute},
+				},
 			},
 		},
 		{
@@ -66,6 +96,9 @@ func TestPipelineRunSpec_SetDefaults(t *testing.T) {
 						},
 					},
 				},
+				Timeouts: &v1.TimeoutFields{
+					Pipeline: &metav1.Duration{Duration: config.DefaultTimeoutMinutes * time.Minute},
+				},
 			},
 		},
 	}
@@ -104,6 +137,9 @@ func TestPipelineRunDefaulting(t *testing.T) {
 				TaskRunTemplate: v1.PipelineTaskRunTemplate{
 					ServiceAccountName: config.DefaultServiceAccountValue,
 				},
+				Timeouts: &v1.TimeoutFields{
+					Pipeline: &metav1.Duration{Duration: config.DefaultTimeoutMinutes * time.Minute},
+				},
 			},
 		},
 	}, {
@@ -128,6 +164,9 @@ func TestPipelineRunDefaulting(t *testing.T) {
 				TaskRunTemplate: v1.PipelineTaskRunTemplate{
 					ServiceAccountName: config.DefaultServiceAccountValue,
 				},
+				Timeouts: &v1.TimeoutFields{
+					Pipeline: &metav1.Duration{Duration: config.DefaultTimeoutMinutes * time.Minute},
+				},
 			},
 		},
 	}, {
@@ -143,6 +182,9 @@ func TestPipelineRunDefaulting(t *testing.T) {
 				TaskRunTemplate: v1.PipelineTaskRunTemplate{
 					ServiceAccountName: config.DefaultServiceAccountValue,
 				},
+				Timeouts: &v1.TimeoutFields{
+					Pipeline: &metav1.Duration{Duration: config.DefaultTimeoutMinutes * time.Minute},
+				},
 			},
 		},
 		wc: func(ctx context.Context) context.Context {
@@ -168,6 +210,9 @@ func TestPipelineRunDefaulting(t *testing.T) {
 				TaskRunTemplate: v1.PipelineTaskRunTemplate{
 					ServiceAccountName: "tekton",
 				},
+				Timeouts: &v1.TimeoutFields{
+					Pipeline: &metav1.Duration{Duration: 5 * time.Minute},
+				},
 			},
 		},
 		wc: func(ctx context.Context) context.Context {
@@ -201,6 +246,9 @@ func TestPipelineRunDefaulting(t *testing.T) {
 						},
 					},
 				},
+				Timeouts: &v1.TimeoutFields{
+					Pipeline: &metav1.Duration{Duration: 5 * time.Minute},
+				},
 			},
 		},
 		wc: func(ctx context.Context) context.Context {
@@ -242,6 +290,9 @@ func TestPipelineRunDefaulting(t *testing.T) {
 						},
 					},
 				},
+				Timeouts: &v1.TimeoutFields{
+					Pipeline: &metav1.Duration{Duration: 5 * time.Minute},
+				},
 			},
 		},
 		wc: func(ctx context.Context) context.Context {
@@ -290,6 +341,9 @@ func TestPipelineRunDefaulting(t *testing.T) {
 						HostNetwork: true,
 					},
 				},
+				Timeouts: &v1.TimeoutFields{
+					Pipeline: &metav1.Duration{Duration: 5 * time.Minute},
+				},
 			},
 		},
 		wc: func(ctx context.Context) context.Context {