Skip to content

Commit 07c556f

Browse files
authored
Merge pull request kubernetes#89822 from jingyih/update_etcd_client_3p4p7
Update etcd client to v3.4.7 in k8s v1.19
2 parents 4fc9981 + 4df3804 commit 07c556f

File tree

27 files changed

+173
-44
lines changed

27 files changed

+173
-44
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ require (
103103
github.com/urfave/negroni v1.0.0 // indirect
104104
github.com/vishvananda/netlink v1.1.0
105105
github.com/vmware/govmomi v0.20.3
106-
go.etcd.io/etcd v0.5.0-alpha.5.0.20200224211402-c65a9e2dd1fd
106+
go.etcd.io/etcd v0.5.0-alpha.5.0.20200401174654-e694b7bb0875
107107
golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975
108108
golang.org/x/lint v0.0.0-20190409202823-959b441ac422
109109
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
@@ -469,7 +469,7 @@ replace (
469469
github.com/xlab/handysort => github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1
470470
github.com/xordataexchange/crypt => github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77
471471
go.etcd.io/bbolt => go.etcd.io/bbolt v1.3.3
472-
go.etcd.io/etcd => go.etcd.io/etcd v0.5.0-alpha.5.0.20200224211402-c65a9e2dd1fd // c65a9e2dd1fd is the SHA for git tag v3.4.4
472+
go.etcd.io/etcd => go.etcd.io/etcd v0.5.0-alpha.5.0.20200401174654-e694b7bb0875 // e694b7bb0875 is the SHA for git tag v3.4.7
473473
go.mongodb.org/mongo-driver => go.mongodb.org/mongo-driver v1.1.2
474474
go.opencensus.io => go.opencensus.io v0.21.0
475475
go.uber.org/atomic => go.uber.org/atomic v1.3.2

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,8 +513,8 @@ github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSf
513513
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
514514
go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk=
515515
go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
516-
go.etcd.io/etcd v0.5.0-alpha.5.0.20200224211402-c65a9e2dd1fd h1:JwlSZ9TSTcRHDGbIr5QG3MEmKyMK99BbNLMJtwnJ0rY=
517-
go.etcd.io/etcd v0.5.0-alpha.5.0.20200224211402-c65a9e2dd1fd/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
516+
go.etcd.io/etcd v0.5.0-alpha.5.0.20200401174654-e694b7bb0875 h1:C7kWARE8r64ppRadl40yfNo6pag+G6ocvGU2xZ6yNes=
517+
go.etcd.io/etcd v0.5.0-alpha.5.0.20200401174654-e694b7bb0875/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
518518
go.mongodb.org/mongo-driver v1.1.2 h1:jxcFYjlkl8xaERsgLo+RNquI0epW6zuy/ZRQs6jnrFA=
519519
go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
520520
go.opencensus.io v0.21.0 h1:mU6zScU4U1YAFPHEHYk+3JC4SY7JxgkqS10ZOSyksNg=

staging/src/k8s.io/apiextensions-apiserver/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/spf13/cobra v0.0.5
1919
github.com/spf13/pflag v1.0.5
2020
github.com/stretchr/testify v1.4.0
21-
go.etcd.io/etcd v0.5.0-alpha.5.0.20200224211402-c65a9e2dd1fd
21+
go.etcd.io/etcd v0.5.0-alpha.5.0.20200401174654-e694b7bb0875
2222
google.golang.org/grpc v1.26.0
2323
gopkg.in/yaml.v2 v2.2.8
2424
k8s.io/api v0.0.0

staging/src/k8s.io/apiextensions-apiserver/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/apiserver/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ require (
3030
github.com/prometheus/client_model v0.2.0
3131
github.com/spf13/pflag v1.0.5
3232
github.com/stretchr/testify v1.4.0
33-
go.etcd.io/etcd v0.5.0-alpha.5.0.20200224211402-c65a9e2dd1fd
33+
go.etcd.io/etcd v0.5.0-alpha.5.0.20200401174654-e694b7bb0875
3434
go.uber.org/zap v1.10.0
3535
golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975
3636
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e

staging/src/k8s.io/apiserver/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/kube-aggregator/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/legacy-cloud-providers/go.sum

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/sample-apiserver/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.etcd.io/etcd/clientv3/BUILD

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)