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.

Sign up for GitHub

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

Jump to bottom

Automated cherry pick of #113286: Merge pull request #113133 from #113967

Merged
merged 1 commit into from Jan 13, 2023
Merged

Automated cherry pick of #113286: Merge pull request #113133 from #113967

merged 1 commit into from Jan 13, 2023
+207 −1

Conversation

sxllwx
Copy link
Member

@sxllwx sxllwx commented Nov 17, 2022 •
edited by k8s-ci-robot

Cherry pick of #113286 on release-1.23.

#113286: Merge pull request #113133 from

For details on the cherry pick process, see the cherry pick requests page.

kube-apiserver: bugfix DeleteCollection API fails if request body is non-empty

@sxllwx
Merge pull request kubernetes#113133 from sxllwx:automated-cherry-pic…
16c6800 
…k-of-kubernetes#113133-upstream-release-1.25

Automated cherry pick of kubernetes#113133: Fix DeleteCollection API decode DeleteOptions fail
@k8s-ci-robot k8s-ci-robot added this to the v1.23 milestone Nov 17, 2022
@k8s-ci-robot k8s-ci-robot added do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 17, 2022
@k8s-ci-robot k8s-ci-robot added area/apiserver sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Nov 17, 2022
@sxllwx sxllwx mentioned this pull request Nov 17, 2022
Merged
@sxllwx
Copy link
Member Author

sxllwx commented Nov 17, 2022

/release-note-edit

kube-apiserver: bugfix DeleteCollection API fails if request body is non-empty

@k8s-ci-robot k8s-ci-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Nov 17, 2022
@leilajal
Copy link
Contributor

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Nov 17, 2022
@xmudrii
Copy link
Member

xmudrii commented Jan 5, 2023

@liggitt @sttts @deads2k Can you PTAL at this PR?

@liggitt
Copy link
Member

liggitt commented Jan 5, 2023

#113286 (comment) said this bug was 1.25+ only... is that accurate?

@xmudrii
Copy link
Member

xmudrii commented Jan 5, 2023

@liggitt My understanding of this is (@sxllwx please correct me if I'm wrong):

From: #113918 (comment) and #113918 (comment)

@xmudrii xmudrii mentioned this pull request Jan 5, 2023
Merged
@sxllwx
Copy link
Member Author

sxllwx commented Jan 6, 2023

@liggitt My understanding of this is (@sxllwx please correct me if I'm wrong):

From: #113918 (comment) and #113918 (comment)

Your description is accurate. Thanks for your explanation.😄

@Verolop
Copy link

Verolop commented Jan 12, 2023

@liggitt @sxllwx in order to approve #113965 , we'd like to get this approved and merged first, PTAL. Thanks!

@liggitt
Copy link
Member

liggitt commented Jan 12, 2023

/lgtm
/approve

this makes deletecollection consistent with what delete was already doing as well

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 12, 2023
@liggitt
Copy link
Member

liggitt commented Jan 12, 2023

/approve cancel
/lgtm cancel

actually, I'm not sure this is correct in isolation... it may have to be combined with #113965 to be correct

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 12, 2023
@k8s-ci-robot k8s-ci-robot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 12, 2023
@liggitt
Copy link
Member

liggitt commented Jan 12, 2023

tested on release-1.23 and with this PR, and verified that no currently working DELETECOLLECTION calls regress, and one failing case starts working

/lgtm
/approve
/kind bug

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Jan 12, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 6b861b6ce7c91ff8809b9b3e36c8e616a23db19d

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liggitt, sxllwx

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 12, 2023
@Verolop
Copy link

Verolop commented Jan 13, 2023

/lgtm

@Verolop Verolop added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jan 13, 2023
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Jan 13, 2023
@k8s-ci-robot k8s-ci-robot merged commit 5ee7d46 into kubernetes:release-1.23 Jan 13, 2023
@Verolop Verolop mentioned this pull request Jan 13, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hzxuzhonghu hzxuzhonghu Awaiting requested review from hzxuzhonghu

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

@liggitt liggitt Awaiting requested review from liggitt

Assignees

@liggitt liggitt

@Verolop Verolop

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.23
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@sxllwx @leilajal @xmudrii @liggitt @Verolop @k8s-ci-robot