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 #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 021585d6f1
commit 393d0b8921
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Godeps/Godeps.json generated
View File

@ -84,7 +84,7 @@
},
{
"ImportPath": "github.com/evanphx/json-patch",
"Rev": "162e5629780b"
"Rev": "v4.9.0"
},
{
"ImportPath": "github.com/fsnotify/fsnotify",
@ -186,10 +186,6 @@
"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.7"
@ -384,19 +380,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "0f665c80805a"
"Rev": "f197499901bd"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "79e0efc2a654"
"Rev": "f7929272bda3"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "e1f134a72784"
"Rev": "78b06b51d5b4"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "ae0dd9a55a47"
"Rev": "231482d3fb08"
},
{
"ImportPath": "k8s.io/gengo",

13
go.mod
View File

@ -5,15 +5,14 @@ module k8s.io/kube-controller-manager
go 1.12
require (
k8s.io/apimachinery v0.0.0
k8s.io/component-base v0.0.0
k8s.io/apimachinery v0.0.0-20200831051605-f7929272bda3
k8s.io/component-base v0.0.0-20200831052829-231482d3fb08
)
replace (
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7
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-20200831051839-f197499901bd
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200831051605-f7929272bda3
k8s.io/client-go => k8s.io/client-go v0.0.0-20200831052244-78b06b51d5b4
k8s.io/component-base => k8s.io/component-base v0.0.0-20200831052829-231482d3fb08
)

4
go.sum
View File

@ -170,6 +170,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-20200831051839-f197499901bd/go.mod h1:RJgKC7GZjtg05LAZsVM4a8fWhl4Ikvy+3y+sl6Mom+Y=
k8s.io/apimachinery v0.0.0-20200831051605-f7929272bda3/go.mod h1:xAtIC8Gj83Pn2OCs2g57wZpZembRhJhiXIlQIqanwas=
k8s.io/client-go v0.0.0-20200831052244-78b06b51d5b4/go.mod h1:Jfrzv9Y4S7CNnDXAzM8nKXzikKIFycs5NMPL1r1RwIs=
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/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=