Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Restore timeouts default for v1 #6311

Merged
merged 1 commit into from
Mar 8, 2023
Merged

Restore timeouts default for v1 #6311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions pkg/apis/pipeline/v1/pipelinerun_defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@ 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 {
prs.Timeouts.Pipeline = &metav1.Duration{Duration: time.Duration(cfg.Defaults.DefaultTimeoutMinutes) * time.Minute}
if prs.Timeouts == nil || prs.Timeouts.Pipeline == nil {
prs.Timeouts = &TimeoutFields{
Pipeline: &metav1.Duration{Duration: time.Duration(cfg.Defaults.DefaultTimeoutMinutes) * time.Minute},
}
}

defaultSA := cfg.Defaults.DefaultServiceAccount
Expand Down
80 changes: 76 additions & 4 deletions pkg/apis/pipeline/v1/pipelinerun_defaults_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ package v1_test

import (
"context"
"strconv"
"testing"
"time"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
Expand All @@ -37,13 +39,58 @@ 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",
JeromeJu marked this conversation as resolved.
Show resolved Hide resolved
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: "timeouts.pipeline is not nil",
prs: &v1.PipelineRunSpec{
Timeouts: &v1.TimeoutFields{
Pipeline: &metav1.Duration{Duration: (config.DefaultTimeoutMinutes + 1) * time.Minute},
},
},
want: &v1.PipelineRunSpec{
TaskRunTemplate: v1.PipelineTaskRunTemplate{
ServiceAccountName: config.DefaultServiceAccountValue,
},
Timeouts: &v1.TimeoutFields{
Pipeline: &metav1.Duration{Duration: (config.DefaultTimeoutMinutes + 1) * 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},
},
},
},
{
Expand All @@ -66,6 +113,9 @@ func TestPipelineRunSpec_SetDefaults(t *testing.T) {
},
},
},
Timeouts: &v1.TimeoutFields{
Pipeline: &metav1.Duration{Duration: config.DefaultTimeoutMinutes * time.Minute},
},
},
},
}
Expand All @@ -91,6 +141,7 @@ func TestPipelineRunSpec_SetDefaults(t *testing.T) {
}

func TestPipelineRunDefaulting(t *testing.T) {
const defaultTimeoutMinutes = 5
tests := []struct {
name string
in *v1.PipelineRun
Expand All @@ -104,6 +155,9 @@ func TestPipelineRunDefaulting(t *testing.T) {
TaskRunTemplate: v1.PipelineTaskRunTemplate{
ServiceAccountName: config.DefaultServiceAccountValue,
},
Timeouts: &v1.TimeoutFields{
Pipeline: &metav1.Duration{Duration: config.DefaultTimeoutMinutes * time.Minute},
},
},
},
}, {
Expand All @@ -128,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},
},
},
},
}, {
Expand All @@ -143,6 +200,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 {
Expand All @@ -168,6 +228,9 @@ func TestPipelineRunDefaulting(t *testing.T) {
TaskRunTemplate: v1.PipelineTaskRunTemplate{
ServiceAccountName: "tekton",
},
Timeouts: &v1.TimeoutFields{
Pipeline: &metav1.Duration{Duration: defaultTimeoutMinutes * time.Minute},
},
},
},
wc: func(ctx context.Context) context.Context {
Expand All @@ -177,7 +240,7 @@ func TestPipelineRunDefaulting(t *testing.T) {
Name: config.GetDefaultsConfigName(),
},
Data: map[string]string{
"default-timeout-minutes": "5",
"default-timeout-minutes": strconv.Itoa(defaultTimeoutMinutes),
"default-service-account": "tekton",
},
})
Expand All @@ -201,6 +264,9 @@ func TestPipelineRunDefaulting(t *testing.T) {
},
},
},
Timeouts: &v1.TimeoutFields{
Pipeline: &metav1.Duration{Duration: defaultTimeoutMinutes * time.Minute},
},
},
},
wc: func(ctx context.Context) context.Context {
Expand All @@ -210,7 +276,7 @@ func TestPipelineRunDefaulting(t *testing.T) {
Name: config.GetDefaultsConfigName(),
},
Data: map[string]string{
"default-timeout-minutes": "5",
"default-timeout-minutes": strconv.Itoa(defaultTimeoutMinutes),
"default-service-account": "tekton",
"default-pod-template": "nodeSelector: { 'label': 'value' }",
},
Expand Down Expand Up @@ -242,6 +308,9 @@ func TestPipelineRunDefaulting(t *testing.T) {
},
},
},
Timeouts: &v1.TimeoutFields{
Pipeline: &metav1.Duration{Duration: defaultTimeoutMinutes * time.Minute},
},
},
},
wc: func(ctx context.Context) context.Context {
Expand All @@ -251,7 +320,7 @@ func TestPipelineRunDefaulting(t *testing.T) {
Name: config.GetDefaultsConfigName(),
},
Data: map[string]string{
"default-timeout-minutes": "5",
"default-timeout-minutes": strconv.Itoa(defaultTimeoutMinutes),
"default-service-account": "tekton",
"default-pod-template": "nodeSelector: { 'label': 'value' }",
},
Expand Down Expand Up @@ -290,6 +359,9 @@ func TestPipelineRunDefaulting(t *testing.T) {
HostNetwork: true,
},
},
Timeouts: &v1.TimeoutFields{
Pipeline: &metav1.Duration{Duration: defaultTimeoutMinutes * time.Minute},
},
},
},
wc: func(ctx context.Context) context.Context {
Expand All @@ -299,7 +371,7 @@ func TestPipelineRunDefaulting(t *testing.T) {
Name: config.GetDefaultsConfigName(),
},
Data: map[string]string{
"default-timeout-minutes": "5",
"default-timeout-minutes": strconv.Itoa(defaultTimeoutMinutes),
"default-service-account": "tekton",
"default-pod-template": "nodeSelector: { 'label': 'value' }\nhostNetwork: true",
},
Expand Down