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

Re-add support for full task status for backward compatibility #790

Merged
merged 1 commit into from
May 1, 2023
Merged

Re-add support for full task status for backward compatibility #790

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
17 changes: 15 additions & 2 deletions pkg/reconciler/pipelinerun/pipelinerun.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,21 @@ func (r *Reconciler) FinalizeKind(ctx context.Context, pr *v1beta1.PipelineRun)

// Get TaskRun names depending on whether embeddedstatus feature is set or not
var trs []string
for _, cr := range pr.Status.ChildReferences {
trs = append(trs, cr.Name)
if len(pr.Status.ChildReferences) == 0 || len(pr.Status.TaskRuns) > 0 || len(pr.Status.Runs) > 0 { //nolint:all //incompatible with pipelines v0.45
for trName, ptrs := range pr.Status.TaskRuns { //nolint:all //incompatible with pipelines v0.45
// TaskRuns within a PipelineRun may not have been finalized yet if the PipelineRun timeout
// has exceeded. Wait to process the PipelineRun on the next update, see
// https://github.com/tektoncd/pipeline/issues/4916
if ptrs.Status == nil || ptrs.Status.CompletionTime == nil {
logging.FromContext(ctx).Infof("taskrun %s within pipelinerun is not yet finalized: embedded status is not complete", trName)
return nil
}
trs = append(trs, trName)
}
} else {
for _, cr := range pr.Status.ChildReferences {
trs = append(trs, cr.Name)
}
}

// Signing both taskruns and pipelineruns causes a race condition when using oci storage
Expand Down
113 changes: 112 additions & 1 deletion pkg/reconciler/pipelinerun/pipelinerun_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,52 @@ func TestReconciler_handlePipelineRun(t *testing.T) {
shouldSign: false,
},
{
name: "taskruns completed",
name: "taskruns completed with full taskrun status",
pr: &v1beta1.PipelineRun{
ObjectMeta: metav1.ObjectMeta{
Name: "pipelinerun",
Namespace: "default",
Annotations: map[string]string{},
},
Status: v1beta1.PipelineRunStatus{
Status: duckv1.Status{
Conditions: []apis.Condition{{Type: apis.ConditionSucceeded}},
},
PipelineRunStatusFields: v1beta1.PipelineRunStatusFields{
TaskRuns: map[string]*v1beta1.PipelineRunTaskRunStatus{
"taskrun1": {
PipelineTaskName: "task1",
Status: &v1beta1.TaskRunStatus{
TaskRunStatusFields: v1beta1.TaskRunStatusFields{
CompletionTime: &metav1.Time{},
},
},
},
},
},
},
},
taskruns: []*v1beta1.TaskRun{
{
ObjectMeta: metav1.ObjectMeta{
Name: "taskrun1",
Namespace: "default",
Annotations: map[string]string{
"chains.tekton.dev/signed": "true",
},
},
Status: v1beta1.TaskRunStatus{
TaskRunStatusFields: v1beta1.TaskRunStatusFields{
CompletionTime: &v1.Time{Time: time.Date(1995, time.December, 24, 6, 12, 12, 24, time.UTC)},
},
},
},
},
shouldSign: true,
wantErr: false,
},
{
name: "taskruns completed with child references",
pr: &v1beta1.PipelineRun{
ObjectMeta: metav1.ObjectMeta{
Name: "pipelinerun",
Expand Down Expand Up @@ -204,6 +249,43 @@ func TestReconciler_handlePipelineRun(t *testing.T) {
},
{
name: "taskruns not yet completed",
pr: &v1beta1.PipelineRun{
ObjectMeta: metav1.ObjectMeta{
Name: "pipelinerun",
Namespace: "default",
Annotations: map[string]string{},
},
Status: v1beta1.PipelineRunStatus{
Status: duckv1.Status{
Conditions: []apis.Condition{{Type: apis.ConditionSucceeded}},
},
PipelineRunStatusFields: v1beta1.PipelineRunStatusFields{
TaskRuns: map[string]*v1beta1.PipelineRunTaskRunStatus{
"taskrun1": {
PipelineTaskName: "task1",
Status: &v1beta1.TaskRunStatus{
TaskRunStatusFields: v1beta1.TaskRunStatusFields{
CompletionTime: &metav1.Time{},
},
},
},
},
},
},
},
taskruns: []*v1beta1.TaskRun{
{
ObjectMeta: metav1.ObjectMeta{
Name: "taskrun1",
Namespace: "default",
},
},
},
shouldSign: false,
wantErr: true,
},
{
name: "taskruns not yet completed with child references",
pr: &v1beta1.PipelineRun{
ObjectMeta: metav1.ObjectMeta{
Name: "pipelinerun",
Expand Down Expand Up @@ -237,6 +319,35 @@ func TestReconciler_handlePipelineRun(t *testing.T) {
},
{
name: "missing taskrun",
pr: &v1beta1.PipelineRun{
ObjectMeta: metav1.ObjectMeta{
Name: "pipelinerun",
Namespace: "default",
Annotations: map[string]string{},
},
Status: v1beta1.PipelineRunStatus{
Status: duckv1.Status{
Conditions: []apis.Condition{{Type: apis.ConditionSucceeded}},
},
PipelineRunStatusFields: v1beta1.PipelineRunStatusFields{
TaskRuns: map[string]*v1beta1.PipelineRunTaskRunStatus{
"taskrun1": {
PipelineTaskName: "task1",
Status: &v1beta1.TaskRunStatus{
TaskRunStatusFields: v1beta1.TaskRunStatusFields{
CompletionTime: &metav1.Time{},
},
},
},
},
},
},
},
shouldSign: false,
wantErr: false,
},
{
name: "missing taskrun with child references",
pr: &v1beta1.PipelineRun{
ObjectMeta: metav1.ObjectMeta{
Name: "pipelinerun",
Expand Down