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 #68428: vendor: bump github.com/evanphx/json-patch #74106

Merged
merged 10 commits into from
Feb 23, 2019
Merged

Automated cherry pick of #68428: vendor: bump github.com/evanphx/json-patch #74106

merged 10 commits into from
Feb 23, 2019

Conversation

caesarxuchao
Copy link
Member

@caesarxuchao caesarxuchao commented Feb 15, 2019 •
edited

Cherry pick of #68428 #68442 #73443 #73713 #73805 #74000 on release-1.11.

#68428: vendor: bump github.com/evanphx/json-patch
#68442: vendor: bump github.com/evanphx/json-patch
#73443: update json-patch to pick up bug fixes
#73713: Importing latest json-patch.
#73805: Adding a limit on the maximum bytes accepted to be
#74000: Limit the number of operations in a single json patch to be

#73805: 
kube-apiserver: a request body of a CREATE/UPDATE/PATCH/DELETE resource operation larger than 100 MB will return a 413 "request entity too large" error.

Custom apiservers built with the latest apiserver library will have the 100MB limit on the body of resource requests as well. The limit can be altered via ServerRunOptions.MaxRequestBodyBytes.

The body size limit does not apply to subresources like pods/proxy that proxy request content to another server.

#74000:
The apiserver, including both the kube-apiserver and apiservers built with the generic apiserver library, will now return 413 RequestEntityTooLarge error if a json patch contains more than 10,000 operations.

philips and others added 6 commits February 14, 2019 18:40
@philips
vendor: bump github.com/evanphx/json-patch
3035eee 
Grab important bug fix that can cause a `panic()` from this package on
certain inputs. See evanphx/json-patch@73af7f5

Signed-off-by: Brandon Philips <brandon@ifup.org>
@CaoShuFeng
vendor: bump github.com/evanphx/json-patch
fff7276 
Grab important bug fix that can cause a `panic()` from this package on
certain inputs. See evanphx/json-patch#64
update json-patch to pick up bug fixes
b31d7bb
Importing latest json-patch.
ca62020
Set the maximum size increase the copy operations in a json patch can…
d2f0628 
… cause
Adding a limit on the maximum bytes accepted to be decoded in a resou…
4658b29 
…rce write request.
@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. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Feb 15, 2019
Chao Xu added 4 commits February 15, 2019 13:15
Make intergration test helper public.
0479012 
This was done in the master branch in
kubernetes#69902. The pull includes many
other changes, so we made this targeted patch.
add integration test
b20e8c8
Loosing the request body size limit to 100MB to account for the size …
7d0e020 
…ratio between json and protobuf.
Limit the number of operations in a single json patch to be 10,000
8a2d338
@caesarxuchao caesarxuchao force-pushed the automated-cherry-pick-of-#68428-#68442-#73443-#73713-#73805-#74000-upstream-release-1.11 branch from 17588cd to 8a2d338 Compare February 15, 2019 21:19
@caesarxuchao
Copy link
Member Author

/assign @cjcullen @liggitt
/assign @calebamiles
the release branch manager

@caesarxuchao
Copy link
Member Author

/unassign @calebamiles
/assign @foxish
the patch release manager.

@k8s-ci-robot k8s-ci-robot assigned foxish and unassigned calebamiles Feb 15, 2019
@liggitt liggitt added this to the v1.11 milestone Feb 16, 2019
@liggitt liggitt added kind/bug Categorizes issue or PR as related to a bug. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. labels Feb 16, 2019
@liggitt liggitt added the sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. label Feb 16, 2019
@k8s-ci-robot k8s-ci-robot removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Feb 16, 2019
@liggitt
Copy link
Member

liggitt commented Feb 16, 2019

/lgtm
/approve

no idea what release note will be pulled in for this omnibus. can we set an explicit one on this PR?

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", 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. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Feb 16, 2019
@caesarxuchao
Copy link
Member Author

I copied the release notes.

@cjcullen cjcullen mentioned this pull request Feb 19, 2019
Merged
@caesarxuchao
Copy link
Member Author

@foxish friendly ping.

@thockin
Copy link
Member

thockin commented Feb 21, 2019

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: caesarxuchao, liggitt, thockin

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 Feb 21, 2019
@foxish foxish added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Feb 22, 2019
@k8s-ci-robot k8s-ci-robot merged commit 5d86c1b into kubernetes:release-1.11 Feb 23, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cheftako cheftako Awaiting requested review from cheftako

@cjcullen cjcullen Awaiting requested review from cjcullen

Assignees

@foxish foxish

@liggitt liggitt

@thockin thockin

@cjcullen cjcullen

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. 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.
Projects
None yet
Milestone
v1.11
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@caesarxuchao @liggitt @thockin @k8s-ci-robot @calebamiles @foxish @cjcullen @philips @CaoShuFeng