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

Do not require enable-api-fields: alpha for entrypoint cancellation #7430

Merged

Conversation

vdemeester
Copy link
Member

Changes

This commit removes the need for enable-api-fields: alpha to enable
the entrypoint cancellation. This feature should only behind the
keep-pod-on-cancel: true feature-flag.

Signed-off-by: Vincent Demeester vdemeest@redhat.com

/kind bug

Submitter Checklist

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

  • Has Docs if any changes are user facing, including updates to minimum requirements e.g. Kubernetes version bumps
  • Has Tests included if any functionality added or changed
  • Follows the commit message standard
  • Meets the Tekton contributor standards (including functionality, content, code)
  • Has a kind label. You can add one by adding a comment on this PR that contains /kind <type>. Valid types are bug, cleanup, design, documentation, feature, flake, misc, question, tep
  • Release notes block below has been updated with any user facing changes (API changes, bug fixes, changes requiring upgrade notices or deprecation warnings). See some examples of good release notes.
  • Release notes contains the string "action required" if the change requires additional action from users switching to the new release

Release Notes

Entrypoint cancellation only requires `keep-pod-on-cancel: true` feature-flag.

@tekton-robot tekton-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 28, 2023
@vdemeester vdemeester force-pushed the keep-pod-on-cancel-only-featureflag branch from c60d580 to 699cd73 Compare November 28, 2023 12:21
@tekton-robot tekton-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 28, 2023
@vdemeester vdemeester force-pushed the keep-pod-on-cancel-only-featureflag branch from 699cd73 to d55ca66 Compare November 28, 2023 12:45
@tekton-robot tekton-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 28, 2023
This commit removes the need for `enable-api-fields: alpha` to enable
the entrypoint cancellation. This feature should only behind the
`keep-pod-on-cancel: true` feature-flag.

Signed-off-by: Vincent Demeester <vdemeest@redhat.com>
@vdemeester vdemeester force-pushed the keep-pod-on-cancel-only-featureflag branch from d55ca66 to 1530cdd Compare November 28, 2023 12:47
@tekton-robot tekton-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Nov 28, 2023
@tekton-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JeromeJu

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 Nov 28, 2023
@vdemeester
Copy link
Member Author

/cherry-pick release-v0.53.x

@tekton-robot
Copy link
Collaborator

@vdemeester: once the present PR merges, I will cherry-pick it on top of release-v0.53.x in a new PR and assign it to you.

In response to this:

/cherry-pick release-v0.53.x

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@Yongxuanzhang
Copy link
Member

/lgtm

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 30, 2023
@tekton-robot tekton-robot merged commit 1b075fb into tektoncd:main Nov 30, 2023
3 checks passed
@tekton-robot
Copy link
Collaborator

@vdemeester: #7430 failed to apply on top of branch "release-v0.53.x":

Applying: Do not require `enable-api-fields: alpha` for entrypoint cancellation
Using index info to reconstruct a base tree...
M	pkg/pod/pod.go
M	pkg/pod/pod_test.go
M	pkg/reconciler/taskrun/taskrun.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/reconciler/taskrun/taskrun.go
CONFLICT (content): Merge conflict in pkg/reconciler/taskrun/taskrun.go
Auto-merging pkg/pod/pod_test.go
Auto-merging pkg/pod/pod.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Do not require `enable-api-fields: alpha` for entrypoint cancellation
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-v0.53.x

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@JeromeJu
Copy link
Member

@vdemeester: #7430 failed to apply on top of branch "release-v0.53.x":

Applying: Do not require `enable-api-fields: alpha` for entrypoint cancellation
Using index info to reconstruct a base tree...
M	pkg/pod/pod.go
M	pkg/pod/pod_test.go
M	pkg/reconciler/taskrun/taskrun.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/reconciler/taskrun/taskrun.go
CONFLICT (content): Merge conflict in pkg/reconciler/taskrun/taskrun.go
Auto-merging pkg/pod/pod_test.go
Auto-merging pkg/pod/pod.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Do not require `enable-api-fields: alpha` for entrypoint cancellation
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Looks like we'd need a manual cherry-pick on this.

@vdemeester vdemeester deleted the keep-pod-on-cancel-only-featureflag branch December 1, 2023 12:48
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/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants