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.16 

Kubernetes-commit: 78981197d01e8524d254656095f3cb71a5851e61
This commit is contained in:
Kubernetes Publisher 2019-08-31 15:21:36 +00:00
parent 6f2478e050
commit a2220b0f9a
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

@ -372,19 +372,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "0ee0e08ff27c"
"Rev": "518b3a755175"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "35bd9ae31030"
"Rev": "93cd198ca677"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "8666a3c21262"
"Rev": "dd35e17ce261"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "52a5b2415085"
"Rev": "10a404db9bd0"
},
{
"ImportPath": "k8s.io/gengo",
@ -396,7 +396,7 @@
},
{
"ImportPath": "k8s.io/kube-openapi",
"Rev": "33be087ad058"
"Rev": "743ec37842bf"
},
{
"ImportPath": "k8s.io/utils",

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-20190831152136-93cd198ca677
k8s.io/component-base v0.0.0-20190831155902-10a404db9bd0
)
replace (
@ -17,9 +17,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-20190831152136-518b3a755175
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190831152136-93cd198ca677
k8s.io/client-go => k8s.io/client-go v0.0.0-20190831152136-dd35e17ce261
k8s.io/component-base => k8s.io/component-base v0.0.0-20190831155902-10a404db9bd0
)

4
go.sum
View File

@ -149,6 +149,10 @@ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/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-20190831152136-518b3a755175/go.mod h1:OZi1H+nmLUaXi/e2yeMps/BJXtz/9Fy9Havh29XEymQ=
k8s.io/apimachinery v0.0.0-20190831152136-93cd198ca677/go.mod h1:nL6pwRT8NgfF8TT68DBI8uEePRt89cSvoXUVqbkWHq4=
k8s.io/client-go v0.0.0-20190831152136-dd35e17ce261/go.mod h1:eSXYam3ygsPhJLfaGNWwVPdSjclGqDb9ai1m1iF+PR8=
k8s.io/component-base v0.0.0-20190831155902-10a404db9bd0/go.mod h1:9k7TUepl24b/N05tTdzQrWJm+etbzflzqVB463BdpOI=
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=