UPSTREAM: 61459: revert: etcd client add dial timeout
This reverts commit
@@ -29,13 +29,11 @@ import (
"k8s.io/apiserver/pkg/storage/value"
)
-var (
// The short keepalive timeout and interval have been chosen to aggressively
// detect a failed etcd server without introducing much overhead.
+var (
keepaliveTime = 30 * time.Second
keepaliveTimeout = 10 * time.Second
- // dialTimeout is the timeout for failing to establish a connection.
- dialTimeout = 10 * time.Second
)
func newETCD3Storage(c storagebackend.Config) (storage.Interface, DestroyFunc, error) {
@@ -54,7 +52,6 @@ func newETCD3Storage(c storagebackend.Config) (storage.Interface, DestroyFunc, e
tlsConfig = nil
}
cfg := clientv3.Config{
- DialTimeout: dialTimeout,
DialKeepAliveTime: keepaliveTime,
DialKeepAliveTimeout: keepaliveTimeout,
Endpoints: c.ServerList,
