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

Update github.com/evanphx/json-patch to e83c0a1c26c884f8ec4fb743f6db9… #92069

Merged
merged 1 commit into from
Jun 17, 2020
Merged

Update github.com/evanphx/json-patch to e83c0a1c26c884f8ec4fb743f6db9… #92069

merged 1 commit into from
Jun 17, 2020

Conversation

tapih
Copy link
Contributor

@tapih tapih commented Jun 12, 2020 •
edited by liggitt
Loading

Signed-off-by: Hiroshi Muraoka h.muraoka714@gmail.com

What type of PR is this?
/kind bug

What this PR does / why we need it:
This PR fixes a bug that JSON patch with kubectl apply has exponential time complexity for the nesting depth of manifest.

Which issue(s) this PR fixes:
Fixes #91615 .

Special notes for your reviewer:
The existing PR #91622 breaks the compatibility to conform to RFC6902 in this patch.
This PR takes an intermediate commit to avoid the compatibility break and fixes just #91615.

Does this PR introduce a user-facing change?:

Fixed a performance issue applying json patches to deeply nested objects

@tapih
Update github.com/evanphx/json-patch to e83c0a1c26c884f8ec4fb743f6db9…
5b06aaa 
…2a941f605f1

Signed-off-by: Hiroshi Muraoka <h.muraoka714@gmail.com>
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/bug Categorizes issue or PR as related to a bug. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 12, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @tapih. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added area/apiserver area/cloudprovider area/dependency Issues or PRs related to dependency changes area/kubectl sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jun 12, 2020
@k8s-ci-robot k8s-ci-robot requested review from ncdc, yue9944882 and a team June 12, 2020 11:33
@tapih
Copy link
Contributor Author

tapih commented Jun 16, 2020

@liggitt Could you review this PR ??

@liggitt
Copy link
Member

liggitt commented Jun 16, 2020

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. release-note-none Denotes a PR that doesn't merit a release note. labels Jun 16, 2020
@liggitt
Copy link
Member

liggitt commented Jun 16, 2020

/retest

@liggitt
Copy link
Member

liggitt commented Jun 16, 2020

/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 Jun 16, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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 Jun 16, 2020
@fedebongio
Copy link
Contributor

Thank you Jordan for looking into it

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@k8s-ci-robot k8s-ci-robot merged commit 81f84d3 into kubernetes:master Jun 17, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.19 milestone Jun 17, 2020
vincepri added a commit to vincepri/controller-runtime that referenced this pull request Jun 19, 2020
@vincepri
Update json-patch to e83c0a1c26c8
6954fa5 
See kubernetes/kubernetes#92069

Signed-off-by: Vince Prignano <vincepri@vmware.com>
vincepri added a commit to vincepri/controller-runtime that referenced this pull request Jun 22, 2020
@vincepri
Update json-patch to e83c0a1c26c8
fc78cc6 
See kubernetes/kubernetes#92069

Signed-off-by: Vince Prignano <vincepri@vmware.com>
@vincepri
Copy link
Member

@liggitt Was just wondering, is this going to be backported as well? Planning to cut controller-runtime releases that depend on 1.17 and 1.18; given that we're heavily dependent on json-patch to calculate merge patches, I've opened a PR to match these changes.

@liggitt
Copy link
Member

liggitt commented Jun 22, 2020

This seems eligible to backport to me. @logicalhan or @tapih, can you open backports of this to 1.16-1.18 release branches for testing?

@vincepri
Copy link
Member

Thanks!

@liggitt liggitt mentioned this pull request Jun 22, 2020
Closed
@github-actions github-actions bot mentioned this pull request Jun 23, 2020
Open
This was referenced Jun 24, 2020
Closed
Closed
Closed
@liggitt liggitt mentioned this pull request Jul 8, 2020
Closed
vincepri added a commit to vincepri/controller-runtime that referenced this pull request Jul 10, 2020
@vincepri
Update json-patch to e83c0a1c26c8
b4b4711 
See kubernetes/kubernetes#92069

Signed-off-by: Vince Prignano <vincepri@vmware.com>
vincepri added a commit to vincepri/controller-runtime that referenced this pull request Jul 10, 2020
@vincepri
Update json-patch to e83c0a1c26c8
c6bd631 
See kubernetes/kubernetes#92069

Signed-off-by: Vince Prignano <vincepri@vmware.com>
@meyskens meyskens mentioned this pull request Jul 25, 2020
Closed
@blaggacao blaggacao mentioned this pull request Jul 31, 2020
Closed
@liggitt liggitt mentioned this pull request Aug 8, 2020
Merged
kevindelgado pushed a commit to kevindelgado/controller-runtime that referenced this pull request Sep 15, 2020
@vincepri @kevindelgado
Update json-patch to e83c0a1c26c8
4f230e9 
See kubernetes/kubernetes#92069

Signed-off-by: Vince Prignano <vincepri@vmware.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ncdc ncdc Awaiting requested review from ncdc

@yue9944882 yue9944882 Awaiting requested review from yue9944882

Assignees

@liggitt liggitt

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver area/cloudprovider area/dependency Issues or PRs related to dependency changes area/kubectl 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. 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. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.19
Development

Successfully merging this pull request may close these issues.

JSON patch with kubectl has exponential time complexity for nesting depth of manifest
6 participants
@tapih @k8s-ci-robot @liggitt @fedebongio @fejta-bot @vincepri