Skip to content

Commit 2f738c7

Browse files
JeromeJuJeromeJu
committed
Remove TaskRuns and Runs Fields of PipelineRunStatus
This commit removes `status.taskruns` and `status.runs` and their corresponding test cases.
1 parent 151e550 commit 2f738c7

19 files changed

+21
-1361
lines changed

‎docs/pipeline-api.md

-36
Original file line numberDiff line numberDiff line change
@@ -9612,9 +9612,6 @@ ParamValue
96129612
</table>
96139613
<h3 id="tekton.dev/v1beta1.PipelineRunRunStatus">PipelineRunRunStatus
96149614
</h3>
9615-
<p>
9616-
(<em>Appears on:</em><a href="#tekton.dev/v1beta1.PipelineRunStatusFields">PipelineRunStatusFields</a>)
9617-
</p>
96189615
<div>
96199616
<p>PipelineRunRunStatus contains the name of the PipelineTask for this CustomRun or Run and the CustomRun or Run&rsquo;s Status</p>
96209617
</div>
@@ -9942,36 +9939,6 @@ Kubernetes meta/v1.Time
99429939
</tr>
99439940
<tr>
99449941
<td>
9945-
<code>taskRuns</code><br/>
9946-
<em>
9947-
<a href="#tekton.dev/v1beta1.PipelineRunTaskRunStatus">
9948-
map[string]*github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1.PipelineRunTaskRunStatus
9949-
</a>
9950-
</em>
9951-
</td>
9952-
<td>
9953-
<em>(Optional)</em>
9954-
<p>Deprecated - use ChildReferences instead.
9955-
map of PipelineRunTaskRunStatus with the taskRun name as the key</p>
9956-
</td>
9957-
</tr>
9958-
<tr>
9959-
<td>
9960-
<code>runs</code><br/>
9961-
<em>
9962-
<a href="#tekton.dev/v1beta1.PipelineRunRunStatus">
9963-
map[string]*github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1.PipelineRunRunStatus
9964-
</a>
9965-
</em>
9966-
</td>
9967-
<td>
9968-
<em>(Optional)</em>
9969-
<p>Deprecated - use ChildReferences instead.
9970-
map of PipelineRunRunStatus with the run name as the key</p>
9971-
</td>
9972-
</tr>
9973-
<tr>
9974-
<td>
99759942
<code>pipelineResults</code><br/>
99769943
<em>
99779944
<a href="#tekton.dev/v1beta1.PipelineRunResult">
@@ -10068,9 +10035,6 @@ map[string]string
1006810035
</table>
1006910036
<h3 id="tekton.dev/v1beta1.PipelineRunTaskRunStatus">PipelineRunTaskRunStatus
1007010037
</h3>
10071-
<p>
10072-
(<em>Appears on:</em><a href="#tekton.dev/v1beta1.PipelineRunStatusFields">PipelineRunStatusFields</a>)
10073-
</p>
1007410038
<div>
1007510039
<p>PipelineRunTaskRunStatus contains the name of the PipelineTask for this TaskRun and the TaskRun&rsquo;s Status</p>
1007610040
</div>

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

+2-58
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

-136
Original file line numberDiff line numberDiff line change
@@ -506,139 +506,3 @@ func TestPipelineRunConversionRoundTrip(t *testing.T) {
506506
}
507507
}
508508
}
509-
510-
func TestPipelineRunConversionConvertTo(t *testing.T) {
511-
taskRuns["tr-0"] = trs
512-
runs["r-0"] = rrs
513-
tests := []struct {
514-
name string
515-
in *v1beta1.PipelineRun
516-
want *v1.PipelineRun
517-
}{{
518-
name: "v1beta1 to v1",
519-
in: &v1beta1.PipelineRun{
520-
ObjectMeta: metav1.ObjectMeta{
521-
Name: "foo",
522-
Namespace: "bar",
523-
},
524-
Spec: v1beta1.PipelineRunSpec{
525-
PipelineRef: &v1beta1.PipelineRef{
526-
Name: "test",
527-
},
528-
},
529-
Status: v1beta1.PipelineRunStatus{
530-
PipelineRunStatusFields: v1beta1.PipelineRunStatusFields{
531-
ChildReferences: append(childRefTaskRuns, childRefRuns...),
532-
TaskRuns: taskRuns,
533-
Runs: runs,
534-
},
535-
},
536-
},
537-
want: &v1.PipelineRun{
538-
ObjectMeta: metav1.ObjectMeta{
539-
Name: "foo",
540-
Namespace: "bar",
541-
},
542-
Spec: v1.PipelineRunSpec{
543-
PipelineRef: &v1.PipelineRef{
544-
Name: "test",
545-
},
546-
},
547-
Status: v1.PipelineRunStatus{
548-
PipelineRunStatusFields: v1.PipelineRunStatusFields{
549-
ChildReferences: []v1.ChildStatusReference{{
550-
TypeMeta: runtime.TypeMeta{Kind: "TaskRun", APIVersion: "tekton.dev/v1beta1"},
551-
Name: "tr-0",
552-
PipelineTaskName: "ptn",
553-
WhenExpressions: []v1.WhenExpression{{Input: "default-value", Operator: "in", Values: []string{"val"}}},
554-
}, {TypeMeta: runtime.TypeMeta{Kind: "Run", APIVersion: "tekton.dev/v1alpha1"},
555-
Name: "r-0",
556-
PipelineTaskName: "ptn-0",
557-
WhenExpressions: []v1.WhenExpression{{Input: "default-value-0", Operator: "in", Values: []string{"val-0", "val-1"}}},
558-
}},
559-
},
560-
},
561-
},
562-
}}
563-
for _, test := range tests {
564-
t.Run(test.name, func(t *testing.T) {
565-
v1PipelineRun := &v1.PipelineRun{}
566-
ctx := context.Background()
567-
if err := test.in.ConvertTo(ctx, v1PipelineRun); err != nil {
568-
t.Errorf("ConvertTo() = %v", err)
569-
}
570-
t.Logf("ConvertTo() = %#v", v1PipelineRun)
571-
if d := cmp.Diff(test.want, v1PipelineRun); d != "" {
572-
t.Errorf("v1beta1 ConvertTo v1 %s", diff.PrintWantGot(d))
573-
}
574-
})
575-
}
576-
}
577-
578-
func TestPipelineRunConversionConvertFrom(t *testing.T) {
579-
taskRuns["tr-0"] = trs
580-
runs["r-0"] = rrs
581-
childRefs := []v1.ChildStatusReference{{
582-
TypeMeta: runtime.TypeMeta{Kind: "TaskRun", APIVersion: "tekton.dev/v1beta1"},
583-
Name: "tr-0",
584-
PipelineTaskName: "ptn",
585-
WhenExpressions: []v1.WhenExpression{{Input: "default-value", Operator: "in", Values: []string{"val"}}},
586-
}, {TypeMeta: runtime.TypeMeta{Kind: "Run", APIVersion: "tekton.dev/v1alpha1"},
587-
Name: "r-0",
588-
PipelineTaskName: "ptn-0",
589-
WhenExpressions: []v1.WhenExpression{{Input: "default-value-0", Operator: "in", Values: []string{"val-0", "val-1"}}},
590-
}}
591-
592-
tests := []struct {
593-
name string
594-
in *v1.PipelineRun
595-
want *v1beta1.PipelineRun
596-
}{{
597-
name: "minimal",
598-
in: &v1.PipelineRun{
599-
ObjectMeta: metav1.ObjectMeta{
600-
Name: "foo",
601-
Namespace: "bar",
602-
},
603-
Spec: v1.PipelineRunSpec{
604-
PipelineRef: &v1.PipelineRef{
605-
Name: "test",
606-
},
607-
},
608-
Status: v1.PipelineRunStatus{
609-
PipelineRunStatusFields: v1.PipelineRunStatusFields{
610-
ChildReferences: childRefs,
611-
},
612-
},
613-
},
614-
want: &v1beta1.PipelineRun{
615-
ObjectMeta: metav1.ObjectMeta{
616-
Name: "foo",
617-
Namespace: "bar",
618-
},
619-
Spec: v1beta1.PipelineRunSpec{
620-
PipelineRef: &v1beta1.PipelineRef{
621-
Name: "test",
622-
},
623-
},
624-
Status: v1beta1.PipelineRunStatus{
625-
PipelineRunStatusFields: v1beta1.PipelineRunStatusFields{
626-
ChildReferences: append(childRefTaskRuns, childRefRuns...),
627-
},
628-
},
629-
},
630-
}}
631-
for _, test := range tests {
632-
t.Run(test.name, func(t *testing.T) {
633-
v1beta1PipelineRun := &v1beta1.PipelineRun{}
634-
ctx := context.Background()
635-
if err := v1beta1PipelineRun.ConvertFrom(ctx, test.in.DeepCopy()); err != nil {
636-
t.Errorf("ConvertFrom() = %v", err)
637-
}
638-
t.Logf("ConvertFrom() = %#v", v1beta1PipelineRun)
639-
if d := cmp.Diff(test.want, v1beta1PipelineRun, cmpopts.EquateEmpty()); d != "" {
640-
t.Errorf("v1beta1 ConvertFrom v1 %s", diff.PrintWantGot(d))
641-
}
642-
})
643-
}
644-
}

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

-16
Original file line numberDiff line numberDiff line change
@@ -351,12 +351,6 @@ func (pr *PipelineRunStatus) GetCondition(t apis.ConditionType) *apis.Condition
351351
// and set the started time to the current time
352352
func (pr *PipelineRunStatus) InitializeConditions(c clock.PassiveClock) {
353353
started := false
354-
if pr.TaskRuns == nil {
355-
pr.TaskRuns = make(map[string]*PipelineRunTaskRunStatus)
356-
}
357-
if pr.Runs == nil {
358-
pr.Runs = make(map[string]*PipelineRunRunStatus)
359-
}
360354
if pr.StartTime.IsZero() {
361355
pr.StartTime = &metav1.Time{Time: c.Now()}
362356
started = true
@@ -422,16 +416,6 @@ type PipelineRunStatusFields struct {
422416
// CompletionTime is the time the PipelineRun completed.
423417
CompletionTime *metav1.Time `json:"completionTime,omitempty"`
424418

425-
// Deprecated - use ChildReferences instead.
426-
// map of PipelineRunTaskRunStatus with the taskRun name as the key
427-
// +optional
428-
TaskRuns map[string]*PipelineRunTaskRunStatus `json:"taskRuns,omitempty"`
429-
430-
// Deprecated - use ChildReferences instead.
431-
// map of PipelineRunRunStatus with the run name as the key
432-
// +optional
433-
Runs map[string]*PipelineRunRunStatus `json:"runs,omitempty"`
434-
435419
// PipelineResults are the list of results written out by the pipeline task's containers
436420
// +optional
437421
// +listType=atomic

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

-16
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,6 @@ func TestInitializePipelineRunConditions(t *testing.T) {
7676
}
7777
p.Status.InitializeConditions(testClock)
7878

79-
if p.Status.TaskRuns == nil {
80-
t.Fatalf("PipelineRun TaskRun status not initialized correctly")
81-
}
82-
83-
if p.Status.Runs == nil {
84-
t.Fatalf("PipelineRun Run status not initialized correctly")
85-
}
86-
8779
if p.Status.StartTime.IsZero() {
8880
t.Fatalf("PipelineRun StartTime not initialized correctly")
8981
}
@@ -92,8 +84,6 @@ func TestInitializePipelineRunConditions(t *testing.T) {
9284
if condition.Reason != v1beta1.PipelineRunReasonStarted.String() {
9385
t.Fatalf("PipelineRun initialize reason should be %s, got %s instead", v1beta1.PipelineRunReasonStarted.String(), condition.Reason)
9486
}
95-
p.Status.TaskRuns["fooTask"] = &v1beta1.PipelineRunTaskRunStatus{}
96-
p.Status.Runs["bahTask"] = &v1beta1.PipelineRunRunStatus{}
9787

9888
// Change the reason before we initialize again
9989
p.Status.SetCondition(&apis.Condition{
@@ -104,12 +94,6 @@ func TestInitializePipelineRunConditions(t *testing.T) {
10494
})
10595

10696
p.Status.InitializeConditions(testClock)
107-
if len(p.Status.TaskRuns) != 1 {
108-
t.Fatalf("PipelineRun TaskRun status getting reset")
109-
}
110-
if len(p.Status.Runs) != 1 {
111-
t.Fatalf("PipelineRun Run status getting reset")
112-
}
11397

11498
newCondition := p.Status.GetCondition(apis.ConditionSucceeded)
11599
if newCondition.Reason != "not just started" {

0 commit comments

Comments
 (0)