Skip to content

Commit

Permalink
Fix tkn tr delete command not deleting trs of completed pr
Browse files Browse the repository at this point in the history 
This will fix the issues of tkn tr delete command
not deleting the completed taskruns of a completed
pipelinerun.
Add tests for the scenario

Fixes: #1972

Signed-off-by: Shiv Verma <[email protected]>
  • Loading branch information
@pratap0007 @tekton-robot
pratap0007 authored and tekton-robot committed Apr 5, 2023
1 parent 2a04d0b commit c558505
Show file tree
Hide file tree
Showing 2 changed files with 242 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pkg/cmd/taskrun/delete.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ func ownerPrFinished(cs *cli.Clients, tr v1.TaskRun) bool {
for _, ref := range tr.GetOwnerReferences() {
if ref.Kind == pipeline.PipelineRunControllerName {
var pr *v1.PipelineRun
err := actions.GetV1(pipelineRunGroupResource, cs, tr.Namespace, ref.Name, metav1.GetOptions{}, &pr)
err := actions.GetV1(pipelineRunGroupResource, cs, ref.Name, tr.Namespace, metav1.GetOptions{}, &pr)
if err != nil {
return false
}
Expand Down
242 changes: 241 additions & 1 deletion pkg/cmd/taskrun/delete_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import (
"time"

"github.com/jonboulle/clockwork"
"github.com/tektoncd/cli/pkg/actions"
"github.com/tektoncd/cli/pkg/cli"
"github.com/tektoncd/cli/pkg/test"
cb "github.com/tektoncd/cli/pkg/test/builder"
testDynamic "github.com/tektoncd/cli/pkg/test/dynamic"
Expand Down Expand Up @@ -2510,7 +2512,7 @@ func Test_TaskRuns_Delete_With_Running_PipelineRun(t *testing.T) {
},
OwnerReferences: []metav1.OwnerReference{
{
APIVersion: "tekton.dev/v1beta1",
APIVersion: "tekton.dev/v1",
Kind: "PipelineRun",
Name: "pipeline-run-1",
UID: "",
Expand Down Expand Up @@ -2666,3 +2668,241 @@ func Test_TaskRuns_Delete_With_Running_PipelineRun(t *testing.T) {
})
}
}

func Test_TaskRuns_Delete_With_Successful_PipelineRun(t *testing.T) {
clock := clockwork.NewFakeClock()

ns := []*corev1.Namespace{
{
ObjectMeta: metav1.ObjectMeta{
Name: "ns",
},
},
}

trs := []*v1.TaskRun{
{
ObjectMeta: metav1.ObjectMeta{
Namespace: "ns",
Name: "tr0-1",
Labels: map[string]string{"tekton.dev/task": "random"},
OwnerReferences: []metav1.OwnerReference{
{
APIVersion: "tekton.dev/v1",
Kind: "PipelineRun",
Name: "pipeline-run-1",
UID: "",
Controller: nil,
BlockOwnerDeletion: nil,
}},
},
Spec: v1.TaskRunSpec{
TaskRef: &v1.TaskRef{
Name: "random",
Kind: v1.NamespacedTaskKind,
},
},
Status: v1.TaskRunStatus{
TaskRunStatusFields: v1.TaskRunStatusFields{
CompletionTime: &metav1.Time{
Time: clock.Now(),
},
},
Status: duckv1.Status{
Conditions: duckv1.Conditions{
{
Status: corev1.ConditionTrue,
Reason: v1.TaskRunReasonSuccessful.String(),
},
},
},
},
},
{
ObjectMeta: metav1.ObjectMeta{
Namespace: "ns",
Name: "tr0-2",
Labels: map[string]string{
"tekton.dev/task": "random",
},
OwnerReferences: []metav1.OwnerReference{
{
APIVersion: "tekton.dev/v1",
Kind: "PipelineRun",
Name: "pipeline-run-1",
UID: "",
Controller: nil,
BlockOwnerDeletion: nil,
}},
},
Spec: v1.TaskRunSpec{
TaskRef: &v1.TaskRef{
Name: "random",
Kind: v1.NamespacedTaskKind,
},
},
Status: v1.TaskRunStatus{
TaskRunStatusFields: v1.TaskRunStatusFields{
CompletionTime: &metav1.Time{
Time: clock.Now(),
},
},
Status: duckv1.Status{
Conditions: duckv1.Conditions{
{
Status: corev1.ConditionTrue,
Reason: v1.TaskRunReasonSuccessful.String(),
},
},
},
},
},
{
ObjectMeta: metav1.ObjectMeta{
Namespace: "ns",
Name: "tr0-3",
Labels: map[string]string{
"tekton.dev/task": "random",
},
OwnerReferences: []metav1.OwnerReference{
{
APIVersion: "tekton.dev/v1",
Kind: "PipelineRun",
Name: "pipeline-run-1",
UID: "",
Controller: nil,
BlockOwnerDeletion: nil,
}},
},
Spec: v1.TaskRunSpec{
TaskRef: &v1.TaskRef{
Name: "random",
Kind: v1.NamespacedTaskKind,
},
},
Status: v1.TaskRunStatus{
TaskRunStatusFields: v1.TaskRunStatusFields{
CompletionTime: &metav1.Time{
Time: clock.Now(),
},
},
Status: duckv1.Status{
Conditions: duckv1.Conditions{
{
Status: corev1.ConditionTrue,
Reason: v1.TaskRunReasonSuccessful.String(),
},
},
},
},
},
{
ObjectMeta: metav1.ObjectMeta{
Namespace: "ns",
Name: "tr0-4",
Labels: map[string]string{
"tekton.dev/task": "random",
},
OwnerReferences: []metav1.OwnerReference{
{
APIVersion: "tekton.dev/v1",
Kind: "PipelineRun",
Name: "pipeline-run-1",
UID: "",
Controller: nil,
BlockOwnerDeletion: nil,
}},
},
Spec: v1.TaskRunSpec{
TaskRef: &v1.TaskRef{
Name: "random",
Kind: v1.NamespacedTaskKind,
},
},
Status: v1.TaskRunStatus{
TaskRunStatusFields: v1.TaskRunStatusFields{
CompletionTime: &metav1.Time{
Time: clock.Now(),
},
},
Status: duckv1.Status{
Conditions: duckv1.Conditions{
{
Status: corev1.ConditionTrue,
Reason: v1.TaskRunReasonSuccessful.String(),
},
},
},
},
},
}

prs := []*v1.PipelineRun{
{
ObjectMeta: metav1.ObjectMeta{
Namespace: "ns",
Name: "pipeline-run-1",
Labels: map[string]string{"tekton.dev/pipeline": "pipeline"},
CreationTimestamp: metav1.Time{Time: clock.Now()},
},
Spec: v1.PipelineRunSpec{
PipelineRef: &v1.PipelineRef{
Name: "pipeline",
},
},
Status: v1.PipelineRunStatus{
Status: duckv1.Status{
Conditions: duckv1.Conditions{
{
Status: corev1.ConditionTrue,
Reason: v1.PipelineRunReasonSuccessful.String(),
},
},
},
PipelineRunStatusFields: v1.PipelineRunStatusFields{
// pipeline run starts now
StartTime: &metav1.Time{Time: clock.Now()},
CompletionTime: &metav1.Time{Time: clock.Now()},
},
},
},
}

cs, _ := test.SeedTestData(t, test.Data{TaskRuns: trs, PipelineRuns: prs, Namespaces: ns})
cs.Pipeline.Resources = cb.APIResourceList(version, []string{"taskrun", "pipelinerun"})
tdc := testDynamic.Options{}
dc, err := tdc.Client(
cb.UnstructuredTR(trs[0], version),
cb.UnstructuredTR(trs[1], version),
cb.UnstructuredTR(trs[2], version),
cb.UnstructuredTR(trs[3], version),
cb.UnstructuredPR(prs[0], version),
)
if err != nil {
t.Errorf("unable to create dynamic client: %v", err)
}

p := &test.Params{Tekton: cs.Pipeline, Kube: cs.Kube, Dynamic: dc, Clock: clock}
p.SetNamespace("ns")

command := Command(p)
command.SetIn(strings.NewReader("y"))
expected := "Are you sure you want to delete all TaskRuns in namespace \"ns\" keeping 1 TaskRuns (y/n): All but 1 TaskRuns(Completed) deleted in namespace \"ns\"\n"
out, err := test.ExecuteCommand(command, "delete", "--keep", "1")
if err != nil {
t.Errorf("unexpected Error")
}
test.AssertOutput(t, expected, out)

client := &cli.Clients{
Tekton: cs.Pipeline,
Kube: cs.Kube,
Dynamic: dc,
}
var tr v1.TaskRunList
err = actions.ListV1(taskrunGroupResource, client, metav1.ListOptions{}, p.Namespace(), &tr)
if err != nil {
t.Errorf("unexpected Error")
}
test.AssertOutput(t, 1, len(tr.Items))
}

0 comments on commit c558505

Please sign in to comment.