Unscheduled Runs shouldn't be included in full status #5287
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tekton-robot
added
release-note
tekton-robot
added
the
size/L
|
/assign @afrittoli |
abayer
added
the
needs-cherry-pick
afrittoli
reviewed
Aug 9, 2022
|
The following is the coverage report on the affected files.
|
abayer
force-pushed
the
unscheduled-run-shouldnt-be-in-status
branch
from
86bfe80
to
3a20f8b
Compare
|
The following is the coverage report on the affected files.
|
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: afrittoli The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
tekton-robot
added
the
approved
|
/test pull-tekton-pipeline-alpha-integration-tests |
|
/retest |
|
cc @tektoncd/core-maintainers - we're going to be cherry-picking this back to 0.37 and 0.38, so an lgtm would be much appreciated. =) |
abayer
force-pushed
the
unscheduled-run-shouldnt-be-in-status
branch
from
3a20f8b
to
8cdf1e7
Compare
|
The following is the coverage report on the affected files.
|
Fixes tektoncd#5282 When removing conditions, I accidentally made `GetRunsStatus` not skip including custom task `ResolvedPipelineTask`s without `Run`s in the `PipelineRun.Status.Runs` map. This resulted in cancellation failing, because the cancellation logic tries to patch each `Run` or `TaskRun` in the `PipelineRun` status (either in the `Runs` and `TaskRuns` maps for full embedded status, or `ChildReferences` for minimal or both embedded status). Unscheduled `PipelineTask`s for `Task`s were already properly excluded from the status map, and `ChildReferences` was fine either way, but due to the oversight I mentioned above, unscheduled `PipelineTask`s for custom tasks _were_ included in the full embedded status map, and cancellation would error due to that. Signed-off-by: Andrew Bayer <[email protected]>
abayer
force-pushed
the
unscheduled-run-shouldnt-be-in-status
branch
from
8cdf1e7
to
3b93c23
Compare
|
The following is the coverage report on the affected files.
|
pritidesai
reviewed
Aug 9, 2022
| @@ -2381,6 +2381,15 @@ spec: | |||
| }}, | |||
| TaskRef: &v1beta1.TaskRef{Name: "unit-test-task"}, | |||
| } | |||
| unscheduledPipelineTask := v1beta1.PipelineTask{ | |||
| Name: "unit-test-2", | |||
| WhenExpressions: []v1beta1.WhenExpression{{ | |||
There was a problem hiding this comment.
What is the significance of whenExpression in the test?
There was a problem hiding this comment.
None - I just copy-pasted the task above.
There was a problem hiding this comment.
will be great to avoid such copy/paste specially given that it does not bring any value to the test, thanks 🙏
|
thanks @abayer 👍 /lgtm |
7 tasks
abayer
added a commit
to abayer/tektoncd-pipeline
that referenced
this pull request
Aug 9, 2022
Fixes tektoncd#5282 When removing conditions, I accidentally made `GetRunsStatus` not skip including custom task `ResolvedPipelineTask`s without `Run`s in the `PipelineRun.Status.Runs` map. This resulted in cancellation failing, because the cancellation logic tries to patch each `Run` or `TaskRun` in the `PipelineRun` status (either in the `Runs` and `TaskRuns` maps for full embedded status, or `ChildReferences` for minimal or both embedded status). Unscheduled `PipelineTask`s for `Task`s were already properly excluded from the status map, and `ChildReferences` was fine either way, but due to the oversight I mentioned above, unscheduled `PipelineTask`s for custom tasks _were_ included in the full embedded status map, and cancellation would error due to that. cherry-picked from tektoncd#5287, with some additional modifications to child reference population for custom tasks without a `Run` which have been fixed in v0.38.x. Signed-off-by: Andrew Bayer <[email protected]>
7 tasks
tekton-robot
pushed a commit
that referenced
this pull request
Aug 9, 2022
Fixes #5282 When removing conditions, I accidentally made `GetRunsStatus` not skip including custom task `ResolvedPipelineTask`s without `Run`s in the `PipelineRun.Status.Runs` map. This resulted in cancellation failing, because the cancellation logic tries to patch each `Run` or `TaskRun` in the `PipelineRun` status (either in the `Runs` and `TaskRuns` maps for full embedded status, or `ChildReferences` for minimal or both embedded status). Unscheduled `PipelineTask`s for `Task`s were already properly excluded from the status map, and `ChildReferences` was fine either way, but due to the oversight I mentioned above, unscheduled `PipelineTask`s for custom tasks _were_ included in the full embedded status map, and cancellation would error due to that. cherry-picked from #5287, with some additional modifications to child reference population for custom tasks without a `Run` which have been fixed in v0.38.x. Signed-off-by: Andrew Bayer <[email protected]>
7 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
Fixes #5282
When removing conditions, I accidentally made
GetRunsStatusnot skip including custom taskResolvedPipelineTasks withoutRuns in thePipelineRun.Status.Runsmap. This resulted in cancellation failing, because the cancellation logic tries to patch eachRunorTaskRunin thePipelineRunstatus (either in theRunsandTaskRunsmaps for full embedded status, orChildReferencesfor minimal or both embedded status). UnscheduledPipelineTasks forTasks were already properly excluded from the status map, andChildReferenceswas fine either way, but due to the oversight I mentioned above, unscheduledPipelineTasks for custom tasks were included in the full embedded status map, and cancellation would error due to that.This will need to be cherry-picked to v0.37.x and v0.38.x, since the issue was a regression.
/kind bug
Submitter Checklist
As the author of this PR, please check off the items in this checklist:
functionality, content, code)
/kind <type>. Valid types are bug, cleanup, design, documentation, feature, flake, misc, question, tepRelease Notes