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

Merge pull request #93811 from liggitt/json-patch-4.8.0-1.18 

[1.18] Update to json-patch 4.8.0

Kubernetes-commit: 7914bac28a993d4493e0c1e31323bb9330dbdcf6
This commit is contained in:
Kubernetes Publisher 2020-08-11 19:19:45 -07:00
parent 277e93d7f7
commit 6fcf969148
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Godeps/Godeps.json generated
View File

@ -92,7 +92,7 @@
},
{
"ImportPath": "github.com/evanphx/json-patch",
"Rev": "v4.2.0"
"Rev": "162e5629780b"
},
{
"ImportPath": "github.com/fsnotify/fsnotify",
@ -206,6 +206,10 @@
"ImportPath": "github.com/imdario/mergo",
"Rev": "v0.3.5"
},
{
"ImportPath": "github.com/jessevdk/go-flags",
"Rev": "v1.4.0"
},
{
"ImportPath": "github.com/json-iterator/go",
"Rev": "v1.1.8"
@ -288,7 +292,7 @@
},
{
"ImportPath": "github.com/pkg/errors",
"Rev": "v0.8.0"
"Rev": "v0.8.1"
},
{
"ImportPath": "github.com/pmezard/go-difflib",
@ -424,19 +428,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "1b2a9461f0df"
"Rev": "e70c4f3b2093"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "6f2abe07e083"
"Rev": "2a282836017b"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "7b592a8174df"
"Rev": "c8494005d10a"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "c597d98b793b"
"Rev": "bf8cd1993483"
},
{
"ImportPath": "k8s.io/gengo",

13
go.mod
View File

@ -5,16 +5,15 @@ module k8s.io/kube-controller-manager
go 1.13
require (
k8s.io/apimachinery v0.0.0
k8s.io/component-base v0.0.0
k8s.io/apimachinery v0.0.0-20200812051649-2a282836017b
k8s.io/component-base v0.0.0-20200812053641-bf8cd1993483
)
replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/api => k8s.io/api v0.0.0-20200812052025-e70c4f3b2093
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200812051649-2a282836017b
k8s.io/client-go => k8s.io/client-go v0.0.0-20200812053003-c8494005d10a
k8s.io/component-base => k8s.io/component-base v0.0.0-20200812053641-bf8cd1993483
)

4
go.sum
View File

@ -183,6 +183,10 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
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-20200812052025-e70c4f3b2093/go.mod h1:MPNnU4pTjzYeFpTSSpWzFiUBRuHB2vtcdUJb5Nn39oA=
k8s.io/apimachinery v0.0.0-20200812051649-2a282836017b/go.mod h1:6sQd+iHEqmOtALqOFjSWp2KZ9F0wlU/nWm0ZgsYWMig=
k8s.io/client-go v0.0.0-20200812053003-c8494005d10a/go.mod h1:OvvlQiEBtKyxjiWi0KJ+aZ1f9I7cE/1RuhQ1+sjsJTc=
k8s.io/component-base v0.0.0-20200812053641-bf8cd1993483/go.mod h1:DS8pSdXjosvgi+dWrpWsxTKezYhpAdiycg3pAE72blk=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=