Merge pull request #96681 from tkashem/request-timout-e2e

Use default value when the specified timeout for a request is 0s

Kubernetes-commit: b381baab6630df955f2428953f9853fa7356d1d3
This commit is contained in:
Kubernetes Publisher 2020-11-18 11:44:05 -08:00
parent e9dd37690f
commit 16ef353c3a
3 changed files with 8 additions and 8 deletions

4
Godeps/Godeps.json generated
View File

@ -696,11 +696,11 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "859536f6dc9b"
"Rev": "2456ebdaba22"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "77eda6a9395b"
"Rev": "66db2540991d"
},
{
"ImportPath": "k8s.io/component-base",

8
go.mod
View File

@ -42,8 +42,8 @@ require (
gopkg.in/square/go-jose.v2 v2.2.2
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0-20201114085527-4a626d306b98
k8s.io/apimachinery v0.0.0-20201114085355-859536f6dc9b
k8s.io/client-go v0.0.0-20201114085741-77eda6a9395b
k8s.io/apimachinery v0.0.0-20201118005411-2456ebdaba22
k8s.io/client-go v0.0.0-20201118005804-66db2540991d
k8s.io/component-base v0.0.0-20201114090208-1e84b325f5ba
k8s.io/klog/v2 v2.4.0
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
@ -55,7 +55,7 @@ require (
replace (
k8s.io/api => k8s.io/api v0.0.0-20201114085527-4a626d306b98
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201114085355-859536f6dc9b
k8s.io/client-go => k8s.io/client-go v0.0.0-20201114085741-77eda6a9395b
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201118005411-2456ebdaba22
k8s.io/client-go => k8s.io/client-go v0.0.0-20201118005804-66db2540991d
k8s.io/component-base => k8s.io/component-base v0.0.0-20201114090208-1e84b325f5ba
)

4
go.sum
View File

@ -602,8 +602,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20201114085527-4a626d306b98/go.mod h1:Vaqh9qFKpET0Mx+jNQHyAcNFyvwkGvuIKOt2htB36BQ=
k8s.io/apimachinery v0.0.0-20201114085355-859536f6dc9b/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
k8s.io/client-go v0.0.0-20201114085741-77eda6a9395b/go.mod h1:R3qihFfcl88JILYbbgUsqpSaJaGXoIO5T/hd87des+k=
k8s.io/apimachinery v0.0.0-20201118005411-2456ebdaba22/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
k8s.io/client-go v0.0.0-20201118005804-66db2540991d/go.mod h1:UTdyXFcu9VZV4qQRKGXCa0KdMX4HTCXClRs4s7yFdDQ=
k8s.io/component-base v0.0.0-20201114090208-1e84b325f5ba/go.mod h1:g6NgUWq2J9mdXytMdP+mNUKEH3kQqHysQcJz3HJEh/U=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=