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

[release-v0.44.x] Fix Timeouts Default in v1 PipelienRun #6554

Merged
merged 1 commit into from
Apr 19, 2023

Conversation

JeromeJu
Copy link
Member

@JeromeJu JeromeJu commented Apr 18, 2023

Changes

This is the cherry-pick of #6546.

This commit fixes the SetDefault for v1 pipelinerun.timeouts. Previously
it would reset pipelinerun.timeouts fields with only timeouts.pipeline while
it should have kept timeouts.tasks and timeouts.finally as expected.

/kind misc

Release Notes

NONE

@tekton-robot tekton-robot added release-note-none Denotes a PR that doesnt merit a release note. kind/misc Categorizes issue or PR as a miscellaneuous one. labels Apr 18, 2023
@tekton-robot tekton-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Apr 18, 2023
@JeromeJu
Copy link
Member Author

cc @vdemeester @lbernick @jerop

@tekton-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vdemeester

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 Apr 18, 2023
@JeromeJu
Copy link
Member Author

ah this made me realize that we should probably also cherry-pick #6311

@JeromeJu
Copy link
Member Author

PTAL #6556
or I could merge them to be in the same commit in this PR

@lbernick
Copy link
Member

I think because #6311 is buggy and #6545 is the fix, we should include both changes in the same PR

This commit fixes the SetDefault for v1 pipelinerun.timeouts. Previously
it would reset pipelinerun.timeouts fields with only timeouts.pipeline while
it should have kept timeouts.tasks and timeouts.finally as expected.
@tekton-robot tekton-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 19, 2023
@JeromeJu
Copy link
Member Author

I think because #6311 is buggy and #6545 is the fix, we should include both changes in the same PR

Thanks @lbernick updated to combine the changes.

@lbernick
Copy link
Member

/lgtm

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 19, 2023
@tekton-robot tekton-robot merged commit a1c1000 into tektoncd:release-v0.44.x Apr 19, 2023
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/misc Categorizes issue or PR as a miscellaneuous one. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesnt merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants