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

Merge pull request #94150 from liggitt/json-patch-1.16 

[1.16] Update to json-patch 4.9.0

Kubernetes-commit: 35a8da66d5516aad90d1302396f06a83dc7f42c0
This commit is contained in:
Kubernetes Publisher 2020-08-30 20:39:21 -07:00
parent bd73caf0e6
commit 1713c515aa
3 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Godeps/Godeps.json generated
View File

@ -132,7 +132,7 @@
},
{
"ImportPath": "github.com/evanphx/json-patch",
"Rev": "162e5629780b"
"Rev": "v4.9.0"
},
{
"ImportPath": "github.com/exponent-io/jsonpath",
@ -262,10 +262,6 @@
"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"
@ -556,19 +552,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "0f665c80805a"
"Rev": "f197499901bd"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "79e0efc2a654"
"Rev": "f7929272bda3"
},
{
"ImportPath": "k8s.io/cli-runtime",
"Rev": "7c99d0e0293a"
"Rev": "b5105397841b"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "e1f134a72784"
"Rev": "78b06b51d5b4"
},
{
"ImportPath": "k8s.io/code-generator",
@ -576,7 +572,7 @@
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "ae0dd9a55a47"
"Rev": "231482d3fb08"
},
{
"ImportPath": "k8s.io/gengo",
@ -592,7 +588,7 @@
},
{
"ImportPath": "k8s.io/metrics",
"Rev": "cbb2723ec9bd"
"Rev": "a857a28192cf"
},
{
"ImportPath": "k8s.io/utils",

27
go.mod
View File

@ -35,14 +35,14 @@ require (
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a
gopkg.in/yaml.v2 v2.2.8
gotest.tools v2.2.0+incompatible // indirect
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-20200831051839-f197499901bd
k8s.io/apimachinery v0.0.0-20200831051605-f7929272bda3
k8s.io/cli-runtime v0.0.0-20200831054746-b5105397841b
k8s.io/client-go v0.0.0-20200831052244-78b06b51d5b4
k8s.io/component-base v0.0.0-20200831052829-231482d3fb08
k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20200410163147-594e756bea31 // release-1.16
k8s.io/metrics v0.0.0
k8s.io/metrics v0.0.0-20200831054602-a857a28192cf
k8s.io/utils v0.0.0-20190801114015-581e00157fb1
sigs.k8s.io/kustomize v2.0.3+incompatible
sigs.k8s.io/yaml v1.1.0
@ -50,12 +50,11 @@ require (
replace (
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7
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-20200831051839-f197499901bd
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200831051605-f7929272bda3
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200831054746-b5105397841b
k8s.io/client-go => k8s.io/client-go v0.0.0-20200831052244-78b06b51d5b4
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200429001146-f5af5c5facff
k8s.io/component-base => k8s.io/component-base v0.0.0-20200831052829-231482d3fb08
k8s.io/metrics => k8s.io/metrics v0.0.0-20200831054602-a857a28192cf
)

7
go.sum
View File

@ -303,6 +303,12 @@ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20200831051839-f197499901bd/go.mod h1:RJgKC7GZjtg05LAZsVM4a8fWhl4Ikvy+3y+sl6Mom+Y=
k8s.io/apimachinery v0.0.0-20200831051605-f7929272bda3/go.mod h1:xAtIC8Gj83Pn2OCs2g57wZpZembRhJhiXIlQIqanwas=
k8s.io/cli-runtime v0.0.0-20200831054746-b5105397841b/go.mod h1:jps4ad+9TSIbZxvCce5SOn37sRLavRXr2bcV1HJnc6Y=
k8s.io/client-go v0.0.0-20200831052244-78b06b51d5b4/go.mod h1:Jfrzv9Y4S7CNnDXAzM8nKXzikKIFycs5NMPL1r1RwIs=
k8s.io/code-generator v0.0.0-20200429001146-f5af5c5facff/go.mod h1:J2H4yLa80/c3JcoMtjfRQ/cqZNWeJnNhrCtedYrPJ+k=
k8s.io/component-base v0.0.0-20200831052829-231482d3fb08/go.mod h1:PpJm1rUQQfNYKotENhyGGBzPfmrA/BDobiANiwVJHf8=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
@ -311,6 +317,7 @@ k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
k8s.io/kube-openapi v0.0.0-20200410163147-594e756bea31 h1:PsbYeEz2x7ll6JYUzBEG+DT78910DDTlvn5Ma10F5/E=
k8s.io/kube-openapi v0.0.0-20200410163147-594e756bea31/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
k8s.io/metrics v0.0.0-20200831054602-a857a28192cf/go.mod h1:2B6O3OKlNB31KL7//uWD2hn597rrPWTsFu236cmoEtw=
k8s.io/utils v0.0.0-20190801114015-581e00157fb1 h1:+ySTxfHnfzZb9ys375PXNlLhkJPLKgHajBU0N62BDvE=
k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=