Skip to content

K
k3s
Commit 4b47cb93 authored by Alex Robinson's avatar Alex Robinson
Browse files
Options

Reduce the default apiserver timeout back down to 30 seconds.

It was originally raised due to slow load balancer creation (#5180), but that was fixed months ago.
parent b6f2f396
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
pkg/apiserver/apiserver.go
View file @ 4b47cb93
...@@ -345,8 +345,7 @@ func parseTimeout(str string) time.Duration { ...@@ -345,8 +345,7 @@ func parseTimeout(str string) time.Duration {
} }
glog.Errorf("Failed to parse %q: %v", str, err) glog.Errorf("Failed to parse %q: %v", str, err)
} }
// TODO: change back to 30s once #5180 is fixed return 30 * time.Second
return 2 * time.Minute
} }
func readBody(req *http.Request) ([]byte, error) { func readBody(req *http.Request) ([]byte, error) {
......
pkg/apiserver/apiserver_test.go
View file @ 4b47cb93
...@@ -2145,10 +2145,10 @@ func TestUpdateChecksDecode(t *testing.T) { ...@@ -2145,10 +2145,10 @@ func TestUpdateChecksDecode(t *testing.T) {
} }
func TestParseTimeout(t *testing.T) { func TestParseTimeout(t *testing.T) {
if d := parseTimeout(""); d != 2*time.Minute { if d := parseTimeout(""); d != 30*time.Second {
t.Errorf("blank timeout produces %v", d) t.Errorf("blank timeout produces %v", d)
} }
if d := parseTimeout("not a timeout"); d != 2*time.Minute { if d := parseTimeout("not a timeout"); d != 30*time.Second {
t.Errorf("bad timeout produces %v", d) t.Errorf("bad timeout produces %v", d)
} }
if d := parseTimeout("10s"); d != 10*time.Second { if d := parseTimeout("10s"); d != 10*time.Second {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment