Merge pull request #13701 from soltysh/request_timeout

Automatic merge from submit-queue (batch tested with PRs 18503, 18399, 13701, 18513, 18515). UPSTREAM: 51042: Allow passing request-timeout from NewRequest all the way down This was split from #13458. @smarterclayton let's continue the discussion here.
openshift · Feb 9, 2018 · 0fd7db9 · 0fd7db9
2 parents 2230c17 + 3bc4d69
commit 0fd7db9
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 15 deletions.
diff --git a/test/integration/etcd_storage_path_test.go b/test/integration/etcd_storage_path_test.go
@@ -1326,7 +1326,7 @@ func (c *allClient) verb(verb string, gvk schema.GroupVersionKind) (*restclient.
 	if err != nil {
 		return nil, err
 	}
-	return restclient.NewRequest(c.client, verb, baseURL, versionedAPIPath, contentConfig, *serializers, c.backoff, c.config.RateLimiter), nil
+	return restclient.NewRequest(c.client, verb, baseURL, versionedAPIPath, contentConfig, *serializers, c.backoff, c.config.RateLimiter, 0), nil
 }
 
 func (c *allClient) create(stub, ns string, mapping *meta.RESTMapping, all *[]cleanupData) error {

diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create_clusterrolebinding_test.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create_clusterrolebinding_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create_rolebinding_test.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create_rolebinding_test.go
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/rest/client.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/rest/client.go
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/rest/fake/fake.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/rest/fake/fake.go
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/rest/request.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/rest/request.go
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/rest/request_test.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/rest/request_test.go
diff --git a/vendor/k8s.io/kubernetes/test/integration/etcd/etcd_storage_path_test.go b/vendor/k8s.io/kubernetes/test/integration/etcd/etcd_storage_path_test.go