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

vendor: Update github.com/evanphx/json-patch #40387

Closed
wants to merge 1 commit into from

Conversation

mikkeloscar
Copy link
Contributor

Updates github.com/evanphx/json-patch dependency to a version that doesn't crash when handling an invalid json patch.

Includes fix from evanphx/json-patch#35

Fix #40218

Updates github.com/evanphx/json-patch dependency to a version that
doesn't crash when handling an invalid json patch.

Includes fix from evanphx/json-patch#35

Fix kubernetes#40218
@k8s-ci-robot
Copy link
Contributor

Hi @mikkeloscar. 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 @k8s-bot 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.

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. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 24, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@k8s-github-robot k8s-github-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note-label-needed labels Jan 24, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] Needs approval from an approver in each of these OWNERS Files:

We suggest the following people:
cc @brendandburns
You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@bgrant0607
Copy link
Member

@k8s-bot ok to test

@mikkeloscar
Copy link
Contributor Author

Running ./hack/verify-godeps.sh locally also fails for me now:

./hack/verify-godeps.sh                                                   [0]
Checking for 'Godeps/' changes against 'origin/master'
Note: checking out 'v74'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

  git checkout -b <new-branch-name>

HEAD is now at f575518... Fix the silly file
godep v74 (linux/amd64/go1.8)
Starting to download all kubernetes godeps. This takes a while
godep: Dep (github.com/appc/spec/schema) restored, but was unable to load it with error:
	Package (k8s.io/apimachinery/pkg/openapi) not found
godep: Dep (github.com/appc/spec/schema/types) restored, but was unable to load it with error:
	Package (k8s.io/apimachinery/pkg/openapi) not found
godep: Dep (k8s.io/heapster/metrics/apis/metrics/v1alpha1) restored, but was unable to load it with error:
	Package (k8s.io/apimachinery/pkg/openapi) not found
godep: Error checking some deps.
!!! Error in ./hack/verify-godeps.sh:104
  '"${GODEP}" restore' exited with status 1
Call stack:
  1: ./hack/verify-godeps.sh:104 main(...)
Exiting with status 1
Removing /tmp/gopath.cBQ2sW

I suspect this is similar to the problem in #41269

I'm setting up a clean GOPATH according to this: https://github.com/kubernetes/community/blob/master/contributors/devel/godep.md#using-godep

I and the apimachinery package is not added:

$ ls -l $GOPATH/src/k8s.io
total 12
drwxr-xr-x 12 moscar users 4096 Feb 25 00:10 gengo
drwxr-xr-x 17 moscar users 4096 Feb 25 00:11 heapster
drwxr-xr-x 23 moscar users 4096 Feb 25 14:46 kubernetes

@mikkeloscar
Copy link
Contributor Author

The error in Jenkins GCE etcd3 e2e seems to be a flake: #42099

@smarterclayton smarterclayton added this to the v1.6 milestone Feb 28, 2017
@smarterclayton smarterclayton added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels Feb 28, 2017
@smarterclayton
Copy link
Contributor

@k8s-bot gce etcd3 e2e test this

@smarterclayton
Copy link
Contributor

@k8s-bot verify test this

@smarterclayton smarterclayton self-assigned this Feb 28, 2017
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Feb 28, 2017

@mikkeloscar: The following test(s) failed:

Test name Commit Details Rerun command
Jenkins verification a408949 link @k8s-bot verify test this

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@ethernetdan ethernetdan removed this from the v1.6 milestone Mar 2, 2017
@ethernetdan
Copy link
Contributor

Removing issue from 1.6 milestone since code freeze has begun:

  • If this is a bug fix, please label as kind/bug and reapply the milestone.
  • If this is a feature for 1.6, an exception should be filed for it before 11:00PM PST on 3/2. Note that most exceptions to code freeze are not accepted.
  • If this is a feature for 1.7, feel free to add the 1.7 milestone to the PR.

/cc @kubernetes/release-team @kubernetes/kubernetes-release-managers

@calebamiles
Copy link
Contributor

Moving this issue into the 1.7 milestone @ethernetdan

cc: @kubernetes/kubernetes-release-managers

@calebamiles calebamiles added this to the v1.7 milestone Mar 2, 2017
@liggitt liggitt modified the milestones: v1.6, v1.7 Mar 14, 2017
@smarterclayton
Copy link
Contributor

This is a crash blocker.

@ncdc
Copy link
Member

ncdc commented Mar 14, 2017

This doesn't pass hack/verify-staging-godeps.sh

@mikkeloscar
Copy link
Contributor Author

Is there any better way to handle godep than this guide?: https://github.com/kubernetes/community/blob/master/contributors/devel/godep.md

I'm running it from a completely clean $GOPATH as suggested but only getting this far:

$ godep restore
godep: Dep (k8s.io/metrics/pkg/apis/custom_metrics) restored, but was unable to load it with error:
	Package (k8s.io/apimachinery/pkg/api/resource) not found
godep: Dep (k8s.io/metrics/pkg/apis/custom_metrics/install) restored, but was unable to load it with error:
	Package (k8s.io/apimachinery/pkg/apimachinery/announced) not found
godep: Dep (k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1) restored, but was unable to load it with error:
	Package (k8s.io/apimachinery/pkg/api/resource) not found
godep: Dep (k8s.io/metrics/pkg/apis/metrics) restored, but was unable to load it with error:
	Package (k8s.io/apimachinery/pkg/apis/meta/v1) not found
godep: Dep (k8s.io/metrics/pkg/apis/metrics/install) restored, but was unable to load it with error:
	Package (k8s.io/apimachinery/pkg/apimachinery/announced) not found
godep: Dep (k8s.io/metrics/pkg/apis/metrics/v1alpha1) restored, but was unable to load it with error:
	Package (k8s.io/apimachinery/pkg/api/resource) not found
godep: Dep (k8s.io/metrics/pkg/client/clientset_generated/clientset) restored, but was unable to load it with error:
	Package (k8s.io/client-go/discovery) not found
godep: Dep (k8s.io/metrics/pkg/client/clientset_generated/clientset/fake) restored, but was unable to load it with error:
	Package (k8s.io/apimachinery/pkg/runtime) not found
godep: Dep (k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme) restored, but was unable to load it with error:
	Package (k8s.io/apimachinery/pkg/apis/meta/v1) not found
godep: Dep (k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1) restored, but was unable to load it with error:
	Package (k8s.io/apimachinery/pkg/apis/meta/v1) not found
godep: Dep (k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake) restored, but was unable to load it with error:
	Package (k8s.io/apimachinery/pkg/apis/meta/v1) not found
godep: Dep (k8s.io/metrics/pkg/client/custom_metrics) restored, but was unable to load it with error:
	Package (k8s.io/apimachinery/pkg/api/meta) not found
godep: Dep (k8s.io/metrics/pkg/client/custom_metrics/fake) restored, but was unable to load it with error:
	Package (k8s.io/apimachinery/pkg/labels) not found
godep: Error checking some deps.

This PR only changes a single sha in Godeps/Godeps.json (+ the vendored files) why is this not ok? :(

@ncdc
Copy link
Member

ncdc commented Mar 14, 2017

If you want to restore godeps, you have to use hack/godep-restore.sh (and hack/godep-save.sh for a full save).

@deads2k
Copy link
Contributor

deads2k commented Mar 14, 2017

regenerated and squashed the files in #43096

@deads2k
Copy link
Contributor

deads2k commented Mar 14, 2017

I ran hack/godep-restore.sh, then hack/update-staging-godeps.sh

@mikkeloscar
Copy link
Contributor Author

Closed in favor of #43096

liggitt pushed a commit to liggitt/kubernetes that referenced this pull request Mar 15, 2017
Automatic merge from submit-queue

vendor: Update github.com/evanphx/json-patch

Regenerated files for kubernetes#40387


Fixes kubernetes#40218
akhilerm pushed a commit to akhilerm/apimachinery that referenced this pull request Sep 20, 2022
Automatic merge from submit-queue

vendor: Update github.com/evanphx/json-patch

Regenerated files for kubernetes/kubernetes#40387


Fixes #40218

Kubernetes-commit: a19210f418a4a245b0c1319f88c14dc66018f10d
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/reliability cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. release-blocker release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

API server crash on malformed PATCH request