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: 1aae77adac170f7eb3d2281c9a56db4ad9ee60ac
This commit is contained in:
Kubernetes Publisher 2019-11-04 06:52:50 -05:00
parent 20b853eafa
commit b7e039e38e
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Godeps/Godeps.json generated
View File

@ -420,19 +420,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "5524a3672fbb"
"Rev": "0fe51414ed68"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "af6325b3a843"
"Rev": "650de2ebb2e8"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "af0e48646694"
"Rev": "60db0a7b4e4d"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "8282bd277fec"
"Rev": "28c829bff12f"
},
{
"ImportPath": "k8s.io/gengo",
@ -448,7 +448,7 @@
},
{
"ImportPath": "k8s.io/utils",
"Rev": "8d271d903fe4"
"Rev": "2b95a09bc58d"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff",

13
go.mod
View File

@ -5,8 +5,8 @@ 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-20191104115250-650de2ebb2e8
k8s.io/component-base v0.0.0-20191104151157-28c829bff12f
)
replace (
@ -18,9 +18,8 @@ replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db
golang.org/x/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d
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-20191104115250-0fe51414ed68
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191104115250-650de2ebb2e8
k8s.io/client-go => k8s.io/client-go v0.0.0-20191104115250-60db0a7b4e4d
k8s.io/component-base => k8s.io/component-base v0.0.0-20191104151157-28c829bff12f
)

4
go.sum
View File

@ -165,6 +165,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-20191104115250-0fe51414ed68/go.mod h1:RW+sC6+W5IPfSGcbw9LDpuQN0GcDTl6S8zkZKASE7FI=
k8s.io/apimachinery v0.0.0-20191104115250-650de2ebb2e8/go.mod h1:gA1T9z4LIup7PIegBwxkF2UYXUNVKhOAPvQWWnAc34k=
k8s.io/client-go v0.0.0-20191104115250-60db0a7b4e4d/go.mod h1:AwNf1u2mt4c46aqNLcNY59DhKPUE8tdCepPgB9XzmHs=
k8s.io/component-base v0.0.0-20191104151157-28c829bff12f/go.mod h1:jtCxwGtpYeFarN8nmBYCx1o+nM5jFsoTJIyBbwzGVYw=
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=