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 #79993 from aramase/controller-manager-multiple-cidr 

Allow multiple node cidr masks in kube-controller-manager

Kubernetes-commit: ded6ee953c68f8333ee6291e0bcb7e58604fac00
This commit is contained in:
Kubernetes Publisher 2019-11-14 23:23:42 -08:00
parent 6401846ba5
commit da4cfb3c23
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Godeps/Godeps.json generated
View File

@ -424,11 +424,11 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "6cd33094d465"
"Rev": "47f6de673b26"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "67a48e0c9266"
"Rev": "3c7067801da2"
},
{
"ImportPath": "k8s.io/client-go",
@ -436,7 +436,7 @@
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "90a8a7f61617"
"Rev": "50dd3c3ffc6e"
},
{
"ImportPath": "k8s.io/gengo",

10
go.mod
View File

@ -5,15 +5,15 @@ module k8s.io/kube-controller-manager
go 1.12
require (
k8s.io/apimachinery v0.0.0-20191114215425-67a48e0c9266
k8s.io/component-base v0.0.0-20191114221108-90a8a7f61617
k8s.io/apimachinery v0.0.0-20191115015347-3c7067801da2
k8s.io/component-base v0.0.0-20191115015918-50dd3c3ffc6e
)
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 => k8s.io/api v0.0.0-20191114215726-6cd33094d465
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191114215425-67a48e0c9266
k8s.io/api => k8s.io/api v0.0.0-20191115095533-47f6de673b26
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191115015347-3c7067801da2
k8s.io/client-go => k8s.io/client-go v0.0.0-20191114220110-6f03b71b98e6
k8s.io/component-base => k8s.io/component-base v0.0.0-20191114221108-90a8a7f61617
k8s.io/component-base => k8s.io/component-base v0.0.0-20191115015918-50dd3c3ffc6e
)

6
go.sum
View File

@ -186,10 +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-20191114215726-6cd33094d465/go.mod h1:TnwOuwwOmtUq5BythlhmbJs+lwQGEsSJ6N4S4ODl2m8=
k8s.io/apimachinery v0.0.0-20191114215425-67a48e0c9266/go.mod h1:dXFS2zaQR8fyzuvRdJDHw2Aerij/yVGJSre0bZQSVJA=
k8s.io/api v0.0.0-20191115095533-47f6de673b26/go.mod h1:iA/8arsvelvo4IDqIhX4IbjTEKBGgvsf2OraTuRtLFU=
k8s.io/apimachinery v0.0.0-20191115015347-3c7067801da2/go.mod h1:dXFS2zaQR8fyzuvRdJDHw2Aerij/yVGJSre0bZQSVJA=
k8s.io/client-go v0.0.0-20191114220110-6f03b71b98e6/go.mod h1:Hykx8A+UlxwDre3qJcqZPgCAZGjl9vNp6yc7SmfMQ1k=
k8s.io/component-base v0.0.0-20191114221108-90a8a7f61617/go.mod h1:mGvZw6rGJi0lRK5Qn3KrpKMsz2SmgmRw9oQoA3xkE7U=
k8s.io/component-base v0.0.0-20191115015918-50dd3c3ffc6e/go.mod h1:mGvZw6rGJi0lRK5Qn3KrpKMsz2SmgmRw9oQoA3xkE7U=
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=