From 3e21057070c8227d217a272b6a2429ed3930ec7e Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Thu, 19 Nov 2020 18:13:37 -0500 Subject: [PATCH] Revert "use default value when the specified timeout is 0s" This reverts commit 0090e27bd3a271e199a232296b45e120dfa9808a. --- .../apiserver/pkg/endpoints/filters/request_deadline.go | 5 +---- .../pkg/endpoints/filters/request_deadline_test.go | 9 --------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/request_deadline.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/request_deadline.go index 9e1f0c1e992..82b8d8d6c31 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/request_deadline.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/request_deadline.go @@ -69,10 +69,7 @@ func WithRequestDeadline(handler http.Handler, longRunning request.LongRunningRe return } - // if the user has specified a timeout of 0s, this means no timeout, so we should use the maximum timeout allowed. - if userSpecifiedTimeout != 0 { - timeout = userSpecifiedTimeout - } + timeout = userSpecifiedTimeout } ctx, cancel := context.WithTimeout(ctx, timeout) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/request_deadline_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/request_deadline_test.go index 9ece6149ba1..a3739dabe60 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/request_deadline_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/request_deadline_test.go @@ -94,15 +94,6 @@ func TestWithRequestDeadline(t *testing.T) { deadlineExpected: 14 * time.Second, // to account for the delay in verification statusCodeExpected: http.StatusOK, }, - { - name: "the specified timeout is 0s, default deadline is expected to be set", - requestURL: "/api/v1/namespaces?timeout=0s", - longRunning: false, - handlerCallCountExpected: 1, - hasDeadlineExpected: true, - deadlineExpected: requestTimeoutMaximum - time.Second, // to account for the delay in verification - statusCodeExpected: http.StatusOK, - }, { name: "the user does not specify any request timeout, default deadline is expected to be set", requestURL: "/api/v1/namespaces?timeout=",