issue with keep and keep-since in taskrun and in pipelinerun

tkn version: 0.30.1

`keep` and `keep-since` support is introduced in https://github.com/tektoncd/cli/pull/1533
though, when we supply `keep` and `keep-since` simultaneously
the out come always equivalent to  `keep`, `keep-since` ignored

Pipelinerun:
https://github.com/tektoncd/cli/blob/f4d092c77d359a48dfdecf708f72293ebf872f5a/pkg/cmd/pipelinerun/delete.go#L329-L338

taskrun:
https://github.com/tektoncd/cli/blob/f4d092c77d359a48dfdecf708f72293ebf872f5a/pkg/cmd/taskrun/delete.go#L379-L388

#### Expected behavior
* `tkn taskrun delete --keep=5 --keep-since=30`
* after executed the above command, remaining `taskruns` will be as `count <= 5` and `start-time <= 30 minutes`
* this is applicable for `pipelineruns` too

	func keepPipelineRunsByAgeAndNumber(pipelineRuns *v1.PipelineRunList, since int, keep int, ignoreRunning bool) ([]string, []string) {
	var todelete, tokeep []string

	todelete, tokeep = keepPipelineRunsByAge(pipelineRuns, since, ignoreRunning)

	if len(tokeep) != keep {
	todelete, tokeep = keepPipelineRunsByNumber(pipelineRuns, keep)
	}
	return todelete, tokeep
	}

	func keepTaskRunsByAgeAndNumber(taskRuns *v1.TaskRunList, since int, keep int, ignoreRunning bool) ([]string, []string) {
	var todelete, tokeep []string

	todelete, tokeep = keepTaskRunsByAge(taskRuns, since, ignoreRunning)

	if len(tokeep) != keep {
	todelete, tokeep = keepTaskRunsByNumber(taskRuns, keep)
	}
	return todelete, tokeep
	}

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

issue with keep and keep-since in taskrun and in pipelinerun #1990

Expected behavior

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development