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.

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

TEP-0090: Refactor GetChildReferences #5006

Merged
merged 1 commit into from
Jun 21, 2022

Conversation

jerop
Copy link
Member

@jerop jerop commented Jun 21, 2022

Changes

Prior to this change, GetChildReferences treated TaskRuns and Runs differently. It added aChildReference only when a TaskRun was not nil, but did not do the check for Runs.

In this change, we consistently add ChildReference only when the Run or TaskRun is not nil.

/kind cleanup

Submitter Checklist

As the author of this PR, please check off the items in this checklist:

  • [n/a] Docs included if any changes are user facing
  • Tests included if any functionality added or changed
  • Follows the commit message standard
  • Meets the Tekton contributor standards (including
    functionality, content, code)
  • Release notes block below has been filled in (if there are no user facing changes, use release note "NONE")

Release Notes

NONE

Prior to this change, `GetChildReferences` treated `TaskRuns`
and `Runs` differently. It added a`ChildReference` only when
a `TaskRun` was not nil, but did not do the check for `Runs`.

In this change, we consistently add `ChildReference` only when
the `Run` or `TaskRun` is not nil.
@tekton-robot tekton-robot added release-note-none Denotes a PR that doesnt merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. labels Jun 21, 2022
@tekton-robot tekton-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 21, 2022
@jerop
Copy link
Member Author

jerop commented Jun 21, 2022

cc @abayer @dibyom @lbernick please take a look

@tekton-robot
Copy link
Collaborator

The following is the coverage report on the affected files.
Say /test pull-tekton-pipeline-go-coverage to re-run this coverage report

File Old Coverage New Coverage Delta
pkg/reconciler/pipelinerun/resources/pipelinerunstate.go 97.3% 97.3% -0.1

@jerop
Copy link
Member Author

jerop commented Jun 21, 2022

/test pull-tekton-pipeline-alpha-integration-tests

@abayer
Copy link
Contributor

abayer commented Jun 21, 2022

/lgtm

Well, that's some simplification I should have seen in the first place. =)

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 21, 2022
@abayer
Copy link
Contributor

abayer commented Jun 21, 2022

/remove-lgtm

} else if rprt.TaskRun != nil {
childRefs = append(childRefs, rprt.getChildRefForTaskRun(taskRunVersion))
switch {
case rprt.Run != nil:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So I didn't think about this on first glance, but now I'm remembering that, in fact, we should be adding a ChildReference for a PipelineTask with nil Run and nil TaskRun if that PipelineTask has WhenExpressions - that is, if the WhenExpressions result in the corresponding Run or TaskRun never getting created, the PipelineTask, with the WhenExpressions, should still be in ChildReferences.

Copy link
Member Author

@jerop jerop Jun 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@abayer we do not create a Run or TaskRun when a PipelineTask is skipped, and "nil" Run or TaskRun should not be added to the PipelineRun status - https://github.com/tektoncd/community/blob/main/teps/0007-conditions-beta.md#status-1

The WhenExpressions for skipped PipelineTasks are in the SkippedTasks section of the PipelineRun status - they should not be in ChildReferences

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aaah, then we should probably remove the WhenExpressions from ChildStatusReference. =)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I remember correctly, the reason we added WhenExpressions to ChildStatusReference is for convenience for users to see the resolved WhenExpressions that evaluated to True and led to the execution of the PipelineTask - open to removing them if users don't find them to be useful (cc @pritidesai)

Copy link
Member

@dibyom dibyom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me!

@tekton-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dibyom

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@tekton-robot tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 21, 2022
@tekton-robot tekton-robot merged commit 09c7ce4 into tektoncd:main Jun 21, 2022
jerop added a commit to jerop/pipeline that referenced this pull request Jun 22, 2022
In tektoncd#5006, we refactored
`GetChildReferences` such that it checks that `TaskRun` is non-nil
before calling the helper function `getChildRefForTaskRun` that
expects a non-nil `TaskRun`.

In this change, we add a check that each `TaskRun` from matrixed
`PipelineTask` is non-nil before calling `getChildRefForTaskRun`.

Related PR: tektoncd#5008
tekton-robot pushed a commit that referenced this pull request Jun 22, 2022
In #5006, we refactored
`GetChildReferences` such that it checks that `TaskRun` is non-nil
before calling the helper function `getChildRefForTaskRun` that
expects a non-nil `TaskRun`.

In this change, we add a check that each `TaskRun` from matrixed
`PipelineTask` is non-nil before calling `getChildRefForTaskRun`.

Related PR: #5008
@jerop jerop changed the title Refactor GetChildReferences TEP-0090: Refactor GetChildReferences Jun 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesnt merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants