kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Version bump to etcd v3.2.11, grpc v1.7.5" 

Kubernetes-commit: 4e8526dc6ba27a40370eea47b17aca1054ca54f9
This commit is contained in:
Wojciech Tyczynski 2017-12-19 15:25:06 +01:00 committed by Kubernetes Publisher
parent a957cd900c
commit e6a0e27d92
3 changed files with 378 additions and 425 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

796
Godeps/Godeps.json generated
View File

File diff suppressed because it is too large Load Diff

1
pkg/storage/etcd/testing/BUILD
View File

@ -13,7 +13,6 @@ go_library(
"//vendor/github.com/coreos/etcd/client:go_default_library",
"//vendor/github.com/coreos/etcd/clientv3:go_default_library",
"//vendor/github.com/coreos/etcd/etcdserver:go_default_library",
"//vendor/github.com/coreos/etcd/etcdserver/api/etcdhttp:go_default_library",
"//vendor/github.com/coreos/etcd/etcdserver/api/v2http:go_default_library",
"//vendor/github.com/coreos/etcd/integration:go_default_library",
"//vendor/github.com/coreos/etcd/pkg/testutil:go_default_library",

6
pkg/storage/etcd/testing/utils.go
View File

@ -35,7 +35,6 @@ import (
etcd "github.com/coreos/etcd/client"
"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/api/etcdhttp"
"github.com/coreos/etcd/etcdserver/api/v2http"
"github.com/coreos/etcd/integration"
"github.com/coreos/etcd/pkg/testutil"
@ -155,7 +154,6 @@ func configureTestCluster(t *testing.T, name string, https bool) *EtcdTestServer
if err != nil {
t.Fatal(err)
}
m.AuthToken = "simple"
} else {
cln := newLocalListener(t)
m.ClientListeners = []net.Listener{cln}
@ -191,9 +189,9 @@ func (m *EtcdTestServer) launch(t *testing.T) error {
if m.s, err = etcdserver.NewServer(&m.ServerConfig); err != nil {
return fmt.Errorf("failed to initialize the etcd server: %v", err)
}
m.s.SyncTicker = time.NewTicker(500 * time.Millisecond)
m.s.SyncTicker = time.Tick(500 * time.Millisecond)
m.s.Start()
m.raftHandler = &testutil.PauseableHandler{Next: etcdhttp.NewPeerHandler(m.s)}
m.raftHandler = &testutil.PauseableHandler{Next: v2http.NewPeerHandler(m.s)}
for _, ln := range m.PeerListeners {
hs := &httptest.Server{
Listener: ln,