Add --request-timeout to allow the global request timeout of 60 seconds to be configured.

This commit is contained in:
Joe Betz
2017-08-26 12:33:33 -07:00
parent 2723e06a25
commit cb764756c6
5 changed files with 29 additions and 12 deletions

View File

@@ -81,6 +81,7 @@ func TestAddFlags(t *testing.T) {
"--kubelet-certificate-authority=/var/run/kubernetes/caserver.crt",
"--proxy-client-cert-file=/var/run/kubernetes/proxy.crt",
"--proxy-client-key-file=/var/run/kubernetes/proxy.key",
"--request-timeout=2m",
"--storage-backend=etcd2",
}
f.Parse(args)
@@ -95,6 +96,7 @@ func TestAddFlags(t *testing.T) {
CorsAllowedOriginList: []string{"10.10.10.100", "10.10.10.200"},
MaxRequestsInFlight: 400,
MaxMutatingRequestsInFlight: 200,
RequestTimeout: time.Duration(2) * time.Minute,
MinRequestTimeout: 1800,
},
Admission: &apiserveroptions.AdmissionOptions{