Skip to content

Commit b7208c4

Browse files
vdemeestertekton-robot
authored andcommitted
SetDefaults for embedded specs (Pipeline, Task) 🥄
Embedded TaskSpec and PipelineSpec were not being *set defaults* when the resource embedding it was. This fixes that. Signed-off-by: Vincent Demeester <[email protected]>
1 parent 80e7b85 commit b7208c4

File tree

5 files changed

+37
-0
lines changed

5 files changed

+37
-0
lines changed

‎pkg/apis/pipeline/v1alpha1/pipeline_defaults.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ func (ps *PipelineSpec) SetDefaults(ctx context.Context) {
3535
pt.TaskRef.Kind = NamespacedTaskKind
3636
}
3737
}
38+
if pt.TaskSpec != nil {
39+
pt.TaskSpec.SetDefaults(ctx)
40+
}
3841
}
3942
for i := range ps.Params {
4043
ps.Params[i].SetDefaults(ctx)

‎pkg/apis/pipeline/v1alpha1/pipelinerun_defaults.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,8 @@ func (prs *PipelineRunSpec) SetDefaults(ctx context.Context) {
5656
if prs.PodTemplate == nil {
5757
prs.PodTemplate = defaultPodTemplate
5858
}
59+
60+
if prs.PipelineSpec != nil {
61+
prs.PipelineSpec.SetDefaults(ctx)
62+
}
5963
}

‎pkg/apis/pipeline/v1beta1/pipeline_defaults.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ func (ps *PipelineSpec) SetDefaults(ctx context.Context) {
3535
pt.TaskRef.Kind = NamespacedTaskKind
3636
}
3737
}
38+
if pt.TaskSpec != nil {
39+
pt.TaskSpec.SetDefaults(ctx)
40+
}
3841
}
3942
for i := range ps.Params {
4043
ps.Params[i].SetDefaults(ctx)

‎pkg/apis/pipeline/v1beta1/pipelinerun_defaults.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,8 @@ func (prs *PipelineRunSpec) SetDefaults(ctx context.Context) {
5656
if prs.PodTemplate == nil {
5757
prs.PodTemplate = defaultPodTemplate
5858
}
59+
60+
if prs.PipelineSpec != nil {
61+
prs.PipelineSpec.SetDefaults(ctx)
62+
}
5963
}

‎pkg/apis/pipeline/v1beta1/pipelinerun_defaults_test.go‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,29 @@ func TestPipelineRunDefaulting(t *testing.T) {
119119
},
120120
},
121121
wc: contexts.WithUpgradeViaDefaulting,
122+
}, {
123+
name: "Embedded PipelineSpec default",
124+
in: &v1beta1.PipelineRun{
125+
Spec: v1beta1.PipelineRunSpec{
126+
PipelineSpec: &v1beta1.PipelineSpec{
127+
Params: []v1beta1.ParamSpec{{
128+
Name: "foo",
129+
}},
130+
},
131+
},
132+
},
133+
want: &v1beta1.PipelineRun{
134+
Spec: v1beta1.PipelineRunSpec{
135+
PipelineSpec: &v1beta1.PipelineSpec{
136+
Params: []v1beta1.ParamSpec{{
137+
Name: "foo",
138+
Type: "string",
139+
}},
140+
},
141+
Timeout: &metav1.Duration{Duration: config.DefaultTimeoutMinutes * time.Minute},
142+
},
143+
},
144+
wc: contexts.WithUpgradeViaDefaulting,
122145
}, {
123146
name: "PipelineRef default config context",
124147
in: &v1beta1.PipelineRun{

0 commit comments

Comments
 (0)