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

Kubernetes-commit: 5d5e3fbd84b30d8bf59bfdf4c14d01196869b92f
This commit is contained in:
Kubernetes Publisher 2019-05-16 03:34:24 +00:00
parent de05f4fe0c
commit 673e26c639
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Godeps/Godeps.json generated
View File

@ -46,6 +46,10 @@
"ImportPath": "github.com/golang/protobuf",
"Rev": "v1.2.0"
},
{
"ImportPath": "github.com/google/go-cmp",
"Rev": "v0.3.0"
},
{
"ImportPath": "github.com/google/gofuzz",
"Rev": "24818f796faf"
@ -164,11 +168,11 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "5b67e417bf61"
"Rev": "3f1c30e3430c"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "549f1afd0bc9"
"Rev": "c2eda234c182"
},
{
"ImportPath": "k8s.io/klog",

11
go.mod
View File

@ -5,15 +5,16 @@ 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-20190528154420-3f1c30e3430c
k8s.io/component-base v0.0.0-20190528155600-c2eda234c182
)
replace (
golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
k8s.io/apimachinery => ../apimachinery
k8s.io/component-base => ../component-base
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190528154420-3f1c30e3430c
k8s.io/component-base => k8s.io/component-base v0.0.0-20190528155600-c2eda234c182
)
replace k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190516033424-7ebde26a7508

2
go.sum
View File

@ -56,6 +56,8 @@ gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
k8s.io/apimachinery v0.0.0-20190528154420-3f1c30e3430c/go.mod h1:Ew3b/24/JSgJdn4RsnrLskv3LvMZDlZ1Fl1xopsJftY=
k8s.io/component-base v0.0.0-20190528155600-c2eda234c182/go.mod h1:q8syV/o+1hhJEyp7sgESYPZpOZe7RNSKbeWECwD2wOQ=
k8s.io/klog v0.3.0 h1:0VPpR+sizsiivjIfIAQH/rl8tan6jvWkS7lU+0di3lE=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=