From 89d5c1f3ea8d8e27526e4f558872c4e24ddc526c Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Tue, 20 Aug 2019 10:36:34 -0400 Subject: [PATCH] plumb client-specified request timeout to context --- .../src/k8s.io/apiserver/pkg/endpoints/handlers/create.go | 3 ++- .../src/k8s.io/apiserver/pkg/endpoints/handlers/delete.go | 7 +++++-- .../src/k8s.io/apiserver/pkg/endpoints/handlers/patch.go | 3 ++- .../src/k8s.io/apiserver/pkg/endpoints/handlers/update.go | 3 ++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/create.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/create.go index ae3fbcae0f7..5f52acfc857 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/create.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/create.go @@ -71,7 +71,8 @@ func createHandler(r rest.NamedCreater, scope *RequestScope, admit admission.Int return } - ctx := req.Context() + ctx, cancel := context.WithTimeout(req.Context(), timeout) + defer cancel() ctx = request.WithNamespace(ctx, namespace) outputMediaType, _, err := negotiation.NegotiateOutputMediaType(req, scope.Serializer, scope) if err != nil { diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/delete.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/delete.go index 08ba77650f3..f84e62332ab 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/delete.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/delete.go @@ -17,6 +17,7 @@ limitations under the License. package handlers import ( + "context" "fmt" "net/http" "time" @@ -59,7 +60,8 @@ func DeleteResource(r rest.GracefulDeleter, allowsOptions bool, scope *RequestSc scope.err(err, w, req) return } - ctx := req.Context() + ctx, cancel := context.WithTimeout(req.Context(), timeout) + defer cancel() ctx = request.WithNamespace(ctx, namespace) ae := request.AuditEventFrom(ctx) admit = admission.WithAudit(admit, ae) @@ -177,7 +179,8 @@ func DeleteCollection(r rest.CollectionDeleter, checkBody bool, scope *RequestSc return } - ctx := req.Context() + ctx, cancel := context.WithTimeout(req.Context(), timeout) + defer cancel() ctx = request.WithNamespace(ctx, namespace) ae := request.AuditEventFrom(ctx) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/patch.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/patch.go index b7360dfe841..fdaba2629ca 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/patch.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/patch.go @@ -93,7 +93,8 @@ func PatchResource(r rest.Patcher, scope *RequestScope, admit admission.Interfac return } - ctx := req.Context() + ctx, cancel := context.WithTimeout(req.Context(), timeout) + defer cancel() ctx = request.WithNamespace(ctx, namespace) outputMediaType, _, err := negotiation.NegotiateOutputMediaType(req, scope.Serializer, scope) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/update.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/update.go index f57062e8e91..61a004aea9d 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/update.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/update.go @@ -61,7 +61,8 @@ func UpdateResource(r rest.Updater, scope *RequestScope, admit admission.Interfa scope.err(err, w, req) return } - ctx := req.Context() + ctx, cancel := context.WithTimeout(req.Context(), timeout) + defer cancel() ctx = request.WithNamespace(ctx, namespace) outputMediaType, _, err := negotiation.NegotiateOutputMediaType(req, scope.Serializer, scope)