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 remote-tracking branch 'origin/master' into release-1.17 

Kubernetes-commit: 525ba1cf14673c58ad0cefbe81c6a508bc1ca9d6
This commit is contained in:
Kubernetes Publisher 2019-11-15 14:26:44 +00:00
parent 832b224673
commit 00b0eeeaaf
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Godeps/Godeps.json generated
View File

@ -424,19 +424,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "06f53b4b24f6"
"Rev": "28bee1a9beb0"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "ff79dfe72cae"
"Rev": "f4e7d7f24368"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "fcde0a10c837"
"Rev": "a4c677cde034"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "a195ff441f6e"
"Rev": "051688b905f7"
},
{
"ImportPath": "k8s.io/gengo",

13
go.mod
View File

@ -5,16 +5,15 @@ 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-20191115142644-f4e7d7f24368
k8s.io/component-base v0.0.0-20191115142644-051688b905f7
)
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-20191115142644-28bee1a9beb0
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191115142644-f4e7d7f24368
k8s.io/client-go => k8s.io/client-go v0.0.0-20191115142644-a4c677cde034
k8s.io/component-base => k8s.io/component-base v0.0.0-20191115142644-051688b905f7
)

4
go.sum
View File

@ -186,6 +186,10 @@ gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
gopkg.in/yaml.v2 v2.2.4/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-20191115142644-28bee1a9beb0/go.mod h1:ZVjGUHSaVjiY2VSFKQpOMtCCSufZWU73UPNKtAURCBQ=
k8s.io/apimachinery v0.0.0-20191115142644-f4e7d7f24368/go.mod h1:dXFS2zaQR8fyzuvRdJDHw2Aerij/yVGJSre0bZQSVJA=
k8s.io/client-go v0.0.0-20191115142644-a4c677cde034/go.mod h1:WUF5AwCjDc8k98qzDetB9Bf0oTpwK8o+7K+CT9DqmDA=
k8s.io/component-base v0.0.0-20191115142644-051688b905f7/go.mod h1:H87peMvYFhfnBrv8vp1Vif/DZwLwPfi8aA5BUnQEJjY=
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=