From 4e7248e47be165b1c460b9f2180afa4398c46866 Mon Sep 17 00:00:00 2001 From: Alex Robinson Date: Wed, 15 Apr 2015 18:35:23 +0000 Subject: [PATCH] Make client service requests use the default timeout now that external load balancers are created asynchronously. --- pkg/client/services.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkg/client/services.go b/pkg/client/services.go index 61c73b8ff66..ec7540d43a6 100644 --- a/pkg/client/services.go +++ b/pkg/client/services.go @@ -17,18 +17,12 @@ limitations under the License. package client import ( - "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" ) -// TODO(a-robinson): Remove this explicit timeout and the calls to -// request.Timeout() that use it once #5180 is in. -const extendedTimeout = 4 * time.Minute - // ServicesNamespacer has methods to work with Service resources in a namespace type ServicesNamespacer interface { Services(namespace string) ServiceInterface @@ -77,20 +71,20 @@ func (c *services) Get(name string) (result *api.Service, err error) { // Create creates a new service. func (c *services) Create(svc *api.Service) (result *api.Service, err error) { result = &api.Service{} - err = c.r.Post().Timeout(extendedTimeout).Namespace(c.ns).Resource("services").Body(svc).Do().Into(result) + err = c.r.Post().Namespace(c.ns).Resource("services").Body(svc).Do().Into(result) return } // Update updates an existing service. func (c *services) Update(svc *api.Service) (result *api.Service, err error) { result = &api.Service{} - err = c.r.Put().Timeout(extendedTimeout).Timeout(extendedTimeout).Namespace(c.ns).Resource("services").Name(svc.Name).Body(svc).Do().Into(result) + err = c.r.Put().Namespace(c.ns).Resource("services").Name(svc.Name).Body(svc).Do().Into(result) return } // Delete deletes an existing service. func (c *services) Delete(name string) error { - return c.r.Delete().Timeout(extendedTimeout).Namespace(c.ns).Resource("services").Name(name).Do().Error() + return c.r.Delete().Namespace(c.ns).Resource("services").Name(name).Do().Error() } // Watch returns a watch.Interface that watches the requested services.