kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #74562 from roycaihw/feat/admission-webhook-timeout 

admission webhook: timeout configuration

Kubernetes-commit: 218642e84ed0e3fcfda1447c8564ba24b90c1f5a
This commit is contained in:
Kubernetes Publisher 2019-02-26 23:40:44 -08:00
parent 13b637786c 30a9fb6e25
commit 8e27117f65
3 changed files with 223 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

426
Godeps/Godeps.json generated
View File

File diff suppressed because it is too large Load Diff

6
pkg/admission/plugin/webhook/mutating/dispatcher.go
View File

@ -101,7 +101,11 @@ func (a *mutatingDispatcher) callAttrMutatingHook(ctx context.Context, h *v1beta
return &webhook.ErrCallingWebhook{WebhookName: h.Name, Reason: err}
}
response := &admissionv1beta1.AdmissionReview{}
if err := client.Post().Context(ctx).Body(&request).Do().Into(response); err != nil {
r := client.Post().Context(ctx).Body(&request)
if h.TimeoutSeconds != nil {
r = r.Timeout(time.Duration(*h.TimeoutSeconds) * time.Second)
}
if err := r.Do().Into(response); err != nil {
return &webhook.ErrCallingWebhook{WebhookName: h.Name, Reason: err}
}

6
pkg/admission/plugin/webhook/validating/dispatcher.go
View File

@ -115,7 +115,11 @@ func (d *validatingDispatcher) callHook(ctx context.Context, h *v1beta1.Webhook,
return &webhook.ErrCallingWebhook{WebhookName: h.Name, Reason: err}
}
response := &admissionv1beta1.AdmissionReview{}
if err := client.Post().Context(ctx).Body(&request).Do().Into(response); err != nil {
r := client.Post().Context(ctx).Body(&request)
if h.TimeoutSeconds != nil {
r = r.Timeout(time.Duration(*h.TimeoutSeconds) * time.Second)
}
if err := r.Do().Into(response); err != nil {
return &webhook.ErrCallingWebhook{WebhookName: h.Name, Reason: err}
}