diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 241c81e5e..f99b22cf9 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -520,7 +520,7 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "fbf594f18f80" + "Rev": "816a9b7df678" }, { "ImportPath": "k8s.io/apimachinery", diff --git a/go.mod b/go.mod index 094e070b9..7b9efdc55 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,7 @@ require ( gopkg.in/square/go-jose.v2 v2.2.2 gopkg.in/yaml.v2 v2.2.4 gotest.tools v2.2.0+incompatible // indirect - k8s.io/api v0.0.0-20191010143144-fbf594f18f80 + k8s.io/api v0.0.0-20191016225839-816a9b7df678 k8s.io/apimachinery v0.0.0-20191016225534-b1267f8c42b4 k8s.io/client-go v0.0.0-20191016230210-14c42cd304d9 k8s.io/component-base v0.0.0-20191016230640-d338b9159fb6 @@ -67,7 +67,7 @@ replace ( golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db golang.org/x/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d - k8s.io/api => k8s.io/api v0.0.0-20191010143144-fbf594f18f80 + k8s.io/api => k8s.io/api v0.0.0-20191016225839-816a9b7df678 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191016225534-b1267f8c42b4 k8s.io/client-go => k8s.io/client-go v0.0.0-20191016230210-14c42cd304d9 k8s.io/component-base => k8s.io/component-base v0.0.0-20191016230640-d338b9159fb6 diff --git a/go.sum b/go.sum index 078f06f63..0da79a3cb 100644 --- a/go.sum +++ b/go.sum @@ -296,7 +296,7 @@ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.0.0-20191010143144-fbf594f18f80/go.mod h1:X3kixOyiuC4u4LU6y2BxLg5tsvw+hrMhstfga7LZ4Gw= +k8s.io/api v0.0.0-20191016225839-816a9b7df678/go.mod h1:LZQaT8MvVpl7Bg2lYFcQm7+Mpdxq8p1NFl3yh+5DCwY= k8s.io/apimachinery v0.0.0-20191016225534-b1267f8c42b4/go.mod h1:92mWDd8Ji2sw2157KIgino5wCxffA8KSvhW2oY4ypdw= k8s.io/client-go v0.0.0-20191016230210-14c42cd304d9/go.mod h1:ct8FBj9BiF4WYNmJoE+SiuhAgSrFs9cyTE7icW+iVr4= k8s.io/component-base v0.0.0-20191016230640-d338b9159fb6/go.mod h1:L2lcIF6P6N33EyqL0ntnoBvJ6t724ev4LzCc0yjn26g= diff --git a/pkg/endpoints/handlers/rest.go b/pkg/endpoints/handlers/rest.go index bc47a72ee..11d13cd31 100644 --- a/pkg/endpoints/handlers/rest.go +++ b/pkg/endpoints/handlers/rest.go @@ -409,7 +409,8 @@ func parseTimeout(str string) time.Duration { } klog.Errorf("Failed to parse %q: %v", str, err) } - return 30 * time.Second + // 34 chose as a number close to 30 that is likely to be unique enough to jump out at me the next time I see a timeout. Everyone chooses 30. + return 34 * time.Second } func isDryRun(url *url.URL) bool { diff --git a/pkg/endpoints/handlers/rest_test.go b/pkg/endpoints/handlers/rest_test.go index ca8c769e9..d1d46e89c 100644 --- a/pkg/endpoints/handlers/rest_test.go +++ b/pkg/endpoints/handlers/rest_test.go @@ -826,10 +826,10 @@ func TestHasUID(t *testing.T) { } func TestParseTimeout(t *testing.T) { - if d := parseTimeout(""); d != 30*time.Second { + if d := parseTimeout(""); d != 34*time.Second { t.Errorf("blank timeout produces %v", d) } - if d := parseTimeout("not a timeout"); d != 30*time.Second { + if d := parseTimeout("not a timeout"); d != 34*time.Second { t.Errorf("bad timeout produces %v", d) } if d := parseTimeout("10s"); d != 10*time.Second {