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 #87442 from jennybuckley/smd-3 

Update structured-merge-diff dependency to v3

Kubernetes-commit: 03cb6afc1a7d43e8ea034279a19801d3d3fb17b3
This commit is contained in:
Kubernetes Publisher 2020-01-22 20:37:26 -08:00
parent 70ea5eb488
commit 2abc6a8c00
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Godeps/Godeps.json generated
View File

@ -424,19 +424,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "7aecbd569fd4"
"Rev": "4a8a79a10e72"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "b615468efe04"
"Rev": "a8b8767d8a3b"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "a432bd9ba7da"
"Rev": "dbf12d30bab2"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "5735a1699056"
"Rev": "69ea596530e0"
},
{
"ImportPath": "k8s.io/gengo",
@ -448,15 +448,15 @@
},
{
"ImportPath": "k8s.io/kube-openapi",
"Rev": "30be4d16710a"
"Rev": "bf4fb3bd569c"
},
{
"ImportPath": "k8s.io/utils",
"Rev": "9e5e9d854fcc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff",
"Rev": "15d366b2352e"
"ImportPath": "sigs.k8s.io/structured-merge-diff/v3",
"Rev": "67a7b8c61874"
},
{
"ImportPath": "sigs.k8s.io/yaml",

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-20200123072051-a8b8767d8a3b
k8s.io/component-base v0.0.0-20200123073003-69ea596530e0
)
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-20200123072230-4a8a79a10e72
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200123072051-a8b8767d8a3b
k8s.io/client-go => k8s.io/client-go v0.0.0-20200123072453-dbf12d30bab2
k8s.io/component-base => k8s.io/component-base v0.0.0-20200123073003-69ea596530e0
)

4
go.sum
View File

@ -184,6 +184,10 @@ gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
gopkg.in/yaml.v2 v2.2.7/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-20200123072230-4a8a79a10e72/go.mod h1:gK8+JxW89UCU1nkhieNMhWeLYy+U8oMbj1ixiRuFvkc=
k8s.io/apimachinery v0.0.0-20200123072051-a8b8767d8a3b/go.mod h1:zQyQRo5ux0MMHMupUGTB3kc5Vtb1ujs2VboEoSdqXwU=
k8s.io/client-go v0.0.0-20200123072453-dbf12d30bab2/go.mod h1:Mvs0VYMt5yNq2vIz4/HRVSpwMHzgJDOYRowklJNeAUc=
k8s.io/component-base v0.0.0-20200123073003-69ea596530e0/go.mod h1:HYjQytpbqD1gc/jzq9oPFrWGhzbhnbua1KK0PxdZO7I=
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=