kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #68442 from CaoShuFeng/json-patch 

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

Kubernetes-commit: 9cf822183f9522028fbb23561b8d51496b8a98fe
This commit is contained in:
Kubernetes Publisher 2018-09-12 15:05:03 -07:00
parent e73ba2ce12 0a5b0f2cd2
commit 3bfd32753e
3 changed files with 99 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

172
Godeps/Godeps.json generated
View File

@ -388,7 +388,7 @@
},
{
"ImportPath": "github.com/evanphx/json-patch",
"Rev": "f195058310bd062ea7c754a834f0ff43b4b63afb"
"Rev": "36442dbdb585210f8d5a1b45e67aa323c197d5c4"
},
{
"ImportPath": "github.com/ghodss/yaml",
@ -856,343 +856,343 @@
},
{
"ImportPath": "k8s.io/api/admission/v1beta1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/apps/v1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/apps/v1beta1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/apps/v1beta2",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/authentication/v1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/authentication/v1beta1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/authorization/v1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/authorization/v1beta1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/autoscaling/v1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta2",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/batch/v1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/batch/v1beta1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/batch/v2alpha1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/certificates/v1beta1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/coordination/v1beta1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/core/v1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/events/v1beta1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/extensions/v1beta1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/networking/v1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/policy/v1beta1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/rbac/v1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/rbac/v1alpha1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/rbac/v1beta1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/scheduling/v1alpha1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/scheduling/v1beta1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/settings/v1alpha1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/storage/v1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/storage/v1alpha1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/api/storage/v1beta1",
"Rev": "012f271b5d41baad56190c5f1ae19bff16df0fd8"
"Rev": "49f236fe119e127d67dec93a9d41ae1c5ed5079e"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/validation",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/validation/path",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/validation",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/naming",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/rand",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/uuid",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/waitgroup",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
},
{
"ImportPath": "k8s.io/client-go/discovery",

2
vendor/github.com/evanphx/json-patch/README.md generated vendored
View File

@ -15,7 +15,7 @@ go get -u github.com/evanphx/json-patch
```
**Stable Versions**:
* Version 3: `go get -u gopkg.in/evanphx/json-patch.v3`
* Version 4: `go get -u gopkg.in/evanphx/json-patch.v4`
(previous versions below `v3` are unavailable)

23
vendor/github.com/evanphx/json-patch/patch.go generated vendored
View File

@ -236,7 +236,7 @@ func (o operation) path() string {
}
func (o operation) from() string {
if obj, ok := o["from"]; ok && obj != nil{
if obj, ok := o["from"]; ok && obj != nil {
var op string
err := json.Unmarshal(*obj, &op)
@ -389,17 +389,13 @@ func (d *partialArray) add(key string, val *lazyNode) error {
cur := *d
if idx < 0 {
idx *= -1
if idx > len(ary) {
return fmt.Errorf("Unable to access invalid index: %d", idx)
}
idx = len(ary) - idx
}
if idx < 0 || idx >= len(ary) || idx > len(cur) {
if idx < -len(ary) || idx >= len(ary) {
return fmt.Errorf("Unable to access invalid index: %d", idx)
}
if idx < 0 {
idx += len(ary)
}
copy(ary[0:idx], cur[0:idx])
ary[idx] = val
copy(ary[idx+1:], cur[idx:])
@ -430,9 +426,12 @@ func (d *partialArray) remove(key string) error {
cur := *d
if idx >= len(cur) {
if idx < -len(cur) || idx >= len(cur) {
return fmt.Errorf("Unable to remove invalid index: %d", idx)
}
if idx < 0 {
idx += len(cur)
}
ary := make([]*lazyNode, len(cur)-1)
@ -535,6 +534,8 @@ func (p Patch) test(doc *container, op operation) error {
return nil
}
return fmt.Errorf("Testing value %s failed", path)
} else if op.value() == nil {
return fmt.Errorf("Testing value %s failed", path)
}
if val.equal(op.value()) {