From ac0b7b5d3bec81de4933d410950dcaef8a09c3c0 Mon Sep 17 00:00:00 2001
From: Chao Xu <xuchao@google.com>
Date: Wed, 4 Nov 2015 16:48:24 -0800
Subject: [PATCH] remove RESTClient.Timeout

---
 cmd/kubemark/hollow-node.go          | 4 ----
 pkg/client/unversioned/restclient.go | 7 +------
 test/e2e/util.go                     | 3 ---
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/cmd/kubemark/hollow-node.go b/cmd/kubemark/hollow-node.go
index ba5c4239c44..0c0ec0d8112 100644
--- a/cmd/kubemark/hollow-node.go
+++ b/cmd/kubemark/hollow-node.go
@@ -19,7 +19,6 @@ package main
 import (
 	"fmt"
 	"runtime"
-	"time"
 
 	docker "github.com/fsouza/go-dockerclient"
 
@@ -72,9 +71,6 @@ func createClientFromFile(path string) (*client.Client, error) {
 	if err != nil {
 		return nil, fmt.Errorf("error while creating client: %v", err)
 	}
-	if client.Timeout == 0 {
-		client.Timeout = 30 * time.Second
-	}
 	return client, nil
 }
 
diff --git a/pkg/client/unversioned/restclient.go b/pkg/client/unversioned/restclient.go
index 2992f11c263..d7f064cc76c 100644
--- a/pkg/client/unversioned/restclient.go
+++ b/pkg/client/unversioned/restclient.go
@@ -19,7 +19,6 @@ package unversioned
 import (
 	"net/url"
 	"strings"
-	"time"
 
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/runtime"
@@ -46,10 +45,6 @@ type RESTClient struct {
 	// used.
 	Client HTTPClient
 
-	// Timeout will be converted to a query parameter and be sent with the request to the API
-	// server. The API server will fail the request if it does not finish within timeout.
-	Timeout time.Duration
-
 	// TODO extract this into a wrapper interface via the RESTClient interface in kubectl.
 	Throttle util.RateLimiter
 }
@@ -93,7 +88,7 @@ func (c *RESTClient) Verb(verb string) *Request {
 	if c.Throttle != nil {
 		c.Throttle.Accept()
 	}
-	return NewRequest(c.Client, verb, c.baseURL, c.apiVersion, c.Codec).Timeout(c.Timeout)
+	return NewRequest(c.Client, verb, c.baseURL, c.apiVersion, c.Codec)
 }
 
 // Post begins a POST request. Short for c.Verb("POST").
diff --git a/test/e2e/util.go b/test/e2e/util.go
index aace4e3f7dc..6b84aa6f917 100644
--- a/test/e2e/util.go
+++ b/test/e2e/util.go
@@ -879,9 +879,6 @@ func loadClient() (*client.Client, error) {
 	if err != nil {
 		return nil, fmt.Errorf("error creating client: %v", err.Error())
 	}
-	if c.Timeout == 0 {
-		c.Timeout = singleCallTimeout
-	}
 	return c, nil
 }