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

Merge pull request #93810 from liggitt/json-patch-4.8.0 

Update to json-patch 4.8.0

Kubernetes-commit: 9b78bd59796d3937986934582230174606403780
This commit is contained in:
Kubernetes Publisher 2020-08-08 12:48:19 -07:00
parent c2dd64005b
commit ee4ab70396
3 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Godeps/Godeps.json generated
View File

@ -208,7 +208,7 @@
},
{
"ImportPath": "github.com/evanphx/json-patch",
"Rev": "e83c0a1c26c8"
"Rev": "162e5629780b"
},
{
"ImportPath": "github.com/exponent-io/jsonpath",
@ -374,6 +374,10 @@
"ImportPath": "github.com/inconshreveable/mousetrap",
"Rev": "v1.0.0"
},
{
"ImportPath": "github.com/jessevdk/go-flags",
"Rev": "v1.4.0"
},
{
"ImportPath": "github.com/jonboulle/clockwork",
"Rev": "v0.1.0"
@ -756,19 +760,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "4859c9473977"
"Rev": "a982eb560ae9"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "945d4ebf362b"
"Rev": "da970ee67a06"
},
{
"ImportPath": "k8s.io/cli-runtime",
"Rev": "17eecdb995dc"
"Rev": "d864cb9d63d7"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "6ecbef177593"
"Rev": "9bbcfbab83f6"
},
{
"ImportPath": "k8s.io/code-generator",
@ -776,7 +780,7 @@
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "756196c2cad2"
"Rev": "840f05b81126"
},
{
"ImportPath": "k8s.io/gengo",
@ -792,7 +796,7 @@
},
{
"ImportPath": "k8s.io/metrics",
"Rev": "6e21444e58da"
"Rev": "ce2e75ff1ac2"
},
{
"ImportPath": "k8s.io/utils",

27
go.mod
View File

@ -34,14 +34,14 @@ require (
github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect
golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/cli-runtime v0.0.0
k8s.io/client-go v0.0.0
k8s.io/component-base v0.0.0
k8s.io/api v0.0.0-20200808211507-a982eb560ae9
k8s.io/apimachinery v0.0.0-20200808211318-da970ee67a06
k8s.io/cli-runtime v0.0.0-20200808213652-d864cb9d63d7
k8s.io/client-go v0.0.0-20200808211739-9bbcfbab83f6
k8s.io/component-base v0.0.0-20200808212316-840f05b81126
k8s.io/klog/v2 v2.2.0
k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9
k8s.io/metrics v0.0.0
k8s.io/metrics v0.0.0-20200808213537-ce2e75ff1ac2
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
sigs.k8s.io/kustomize v2.0.3+incompatible
sigs.k8s.io/yaml v1.2.0
@ -49,12 +49,11 @@ require (
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/cli-runtime => ../cli-runtime
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/component-base => ../component-base
k8s.io/kubectl => ../kubectl
k8s.io/metrics => ../metrics
k8s.io/api => k8s.io/api v0.0.0-20200808211507-a982eb560ae9
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200808211318-da970ee67a06
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200808213652-d864cb9d63d7
k8s.io/client-go => k8s.io/client-go v0.0.0-20200808211739-9bbcfbab83f6
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200726131043-26c52896b75b
k8s.io/component-base => k8s.io/component-base v0.0.0-20200808212316-840f05b81126
k8s.io/metrics => k8s.io/metrics v0.0.0-20200808213537-ce2e75ff1ac2
)

7
go.sum
View File

@ -509,6 +509,12 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
k8s.io/api v0.0.0-20200808211507-a982eb560ae9/go.mod h1:D0dJADuMCXgjxg4UaYG8TQtO9YT35ZcOfdyvLjv/oSc=
k8s.io/apimachinery v0.0.0-20200808211318-da970ee67a06/go.mod h1:PDaNuc2kVa6eEsr0Zd3n7+UDnwWc2vQSKszKolx4i8M=
k8s.io/cli-runtime v0.0.0-20200808213652-d864cb9d63d7/go.mod h1:4nBfI3AuwqNn2jQodLhSFh6/EaJVYqYz3s6syCrN2yA=
k8s.io/client-go v0.0.0-20200808211739-9bbcfbab83f6/go.mod h1:K9apKx77d2ALpTCifIBUnUMy7wKDyQKWGiaX5MMeJOc=
k8s.io/code-generator v0.0.0-20200726131043-26c52896b75b/go.mod h1:l+Q5vASED8GWxNspCbHMV4q9mcQ6DhLzqwoZhvWz7wU=
k8s.io/component-base v0.0.0-20200808212316-840f05b81126/go.mod h1:n8rw+YsWY+8i6Gu7I9KzSV/lrCY9HLlTPvnEg+Fb0tk=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
@ -516,6 +522,7 @@ k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9 h1:5NC2ITmvg8RoxoH0wgmL4zn4VZqXGsKbxrikjaQx6s4=
k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9/go.mod h1:bfCVj+qXcEaE5SCvzBaqpOySr6tuCcpPKqF6HD8nyCw=
k8s.io/metrics v0.0.0-20200808213537-ce2e75ff1ac2/go.mod h1:5NIUchc4QVIAloB7aw4qGITwrq2XYJquJT5Mpll52bQ=
k8s.io/utils v0.0.0-20200729134348-d5654de09c73 h1:uJmqzgNWG7XyClnU/mLPBWwfKKF1K8Hf8whTseBgJcg=
k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=