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

Fix custom object patch API content type in release-10.0 branch #887

Conversation

roycaihw
Copy link
Member

@roycaihw roycaihw commented Jul 19, 2019

Fix a regression in custom object patch API that can break existing clients who use JSON merge patch to patch custom objects.

ref: #866

NOTE:

  1. the bug doesn't exist in master branch. It was introduced in Release 10.0.0 #864 (comment)
  2. e2e test in master branch didn't exercise CRD and CR APIs. I added a test to demo the fix. See [DO NOT MERGE] Demonstrate custom object JSON merge patch failure #885 and [DO NOT MERGE] Demonstrate hotfix for #866 #886. We can merge that test into master branch later
  3. we don't cherrypick the test into the release branch, since our travis-ci only works with the master branch.
  4. long-term plan: Unsupported Media Type (HTTP 415) when patching custom resources #866 (comment)

/assign @yliaog
/kind bug
/priority critical-urgent

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jul 19, 2019
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 19, 2019
@yliaog
Copy link
Contributor

yliaog commented Jul 19, 2019

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 19, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: roycaihw, yliaog

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 merged commit fd9edfe into kubernetes-client:release-10.0 Jul 19, 2019
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. 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/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants