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 #83987 from wenjiaswe/etcd_client_3_4_2 

Update etcd client to v3.4.3 in k8s v1.17

Kubernetes-commit: 09f453ff8322979ed5a7611bc2e5528506c1fc7f
This commit is contained in:
Kubernetes Publisher 2019-10-25 08:29:39 -07:00
parent 465457fa69
commit 6de08162fd
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Godeps/Godeps.json generated
View File

@ -152,11 +152,11 @@
}, },
{ {
"ImportPath": "github.com/golang/protobuf", "ImportPath": "github.com/golang/protobuf",
"Rev": "v1.3.1" "Rev": "v1.3.2"
}, },
{ {
"ImportPath": "github.com/google/btree", "ImportPath": "github.com/google/btree",
"Rev": "4030bb1f1f0c" "Rev": "v1.0.0"
}, },
{ {
"ImportPath": "github.com/google/go-cmp", "ImportPath": "github.com/google/go-cmp",
@ -296,7 +296,7 @@
}, },
{ {
"ImportPath": "github.com/prometheus/client_golang", "ImportPath": "github.com/prometheus/client_golang",
"Rev": "v0.9.4" "Rev": "v1.0.0"
}, },
{ {
"ImportPath": "github.com/prometheus/client_model", "ImportPath": "github.com/prometheus/client_model",
@ -420,19 +420,19 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "fbf594f18f80" "Rev": "5524a3672fbb"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "fb3eea214746" "Rev": "af6325b3a843"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "bd505ee787b2" "Rev": "af0e48646694"
}, },
{ {
"ImportPath": "k8s.io/component-base", "ImportPath": "k8s.io/component-base",
"Rev": "ca590c444ad5" "Rev": "8282bd277fec"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",

13
go.mod
View File

@ -5,8 +5,8 @@ module k8s.io/kube-controller-manager
go 1.12 go 1.12
require ( require (
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20191025225532-af6325b3a843
k8s.io/component-base v0.0.0 k8s.io/component-base v0.0.0-20191025230438-8282bd277fec
) )
replace ( replace (
@ -18,9 +18,8 @@ replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 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/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db
golang.org/x/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d golang.org/x/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d
k8s.io/api => ../api k8s.io/api => k8s.io/api v0.0.0-20191025225708-5524a3672fbb
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191025225532-af6325b3a843
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20191025225928-af0e48646694
k8s.io/component-base => ../component-base k8s.io/component-base => k8s.io/component-base v0.0.0-20191025230438-8282bd277fec
k8s.io/kube-controller-manager => ../kube-controller-manager
) )

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= 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-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/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-20191025225708-5524a3672fbb/go.mod h1:NMIXwlJTrA+pXie6lv562GUPkluJ4oRGzQfqWBLaceY=
k8s.io/apimachinery v0.0.0-20191025225532-af6325b3a843/go.mod h1:gA1T9z4LIup7PIegBwxkF2UYXUNVKhOAPvQWWnAc34k=
k8s.io/client-go v0.0.0-20191025225928-af0e48646694/go.mod h1:ZLqcZX6t7degTAe8tELFpWE+ekFiCB7rH8Wc4u320BA=
k8s.io/component-base v0.0.0-20191025230438-8282bd277fec/go.mod h1:Oa5A1rdMeb3k4pUSQNaikaVH960cCakU3DgVvzkR+/A=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= 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.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=