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

allow overriding the default grace period of 45 seconds (#2423) 

This allows users to configure a faster restart of their
webhook if desired while retaining the current behavior.
This commit is contained in:
Todd 2022-02-28 13:40:09 -06:00 committed by GitHub
parent 4c2331f26a
commit 9b5c41135d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
webhook/webhook.go
View File

@ -34,7 +34,6 @@ import (
"golang.org/x/sync/errgroup" "golang.org/x/sync/errgroup"
admissionv1 "k8s.io/api/admission/v1" admissionv1 "k8s.io/api/admission/v1"
"knative.dev/pkg/logging" "knative.dev/pkg/logging"
"knative.dev/pkg/network"
"knative.dev/pkg/system" "knative.dev/pkg/system"
certresources "knative.dev/pkg/webhook/certificates/resources" certresources "knative.dev/pkg/webhook/certificates/resources"
) )
@ -60,6 +59,10 @@ type Options struct {
// StatsReporter reports metrics about the webhook. // StatsReporter reports metrics about the webhook.
// This will be automatically initialized by the constructor if left uninitialized. // This will be automatically initialized by the constructor if left uninitialized.
StatsReporter StatsReporter StatsReporter StatsReporter
// GracePeriod is how long to wait after failing readiness probes
// before shutting down.
GracePeriod time.Duration
} }
// Operation is the verb being operated on // Operation is the verb being operated on
@ -83,10 +86,6 @@ type Webhook struct {
// synced is function that is called when the informers have been synced. // synced is function that is called when the informers have been synced.
synced context.CancelFunc synced context.CancelFunc
// grace period is how long to wait after failing readiness probes
// before shutting down.
gracePeriod time.Duration
mux http.ServeMux mux http.ServeMux
// The TLS configuration to use for serving (or nil for non-TLS) // The TLS configuration to use for serving (or nil for non-TLS)
@ -123,10 +122,9 @@ func New(
syncCtx, cancel := context.WithCancel(context.Background()) syncCtx, cancel := context.WithCancel(context.Background())
webhook = &Webhook{ webhook = &Webhook{
Options: *opts, Options: *opts,
Logger: logger, Logger: logger,
synced: cancel, synced: cancel,
gracePeriod: network.DefaultDrainTimeout,
} }
if opts.SecretName != "" { if opts.SecretName != "" {
@ -207,7 +205,7 @@ func (wh *Webhook) Run(stop <-chan struct{}) error {
drainer := &handlers.Drainer{ drainer := &handlers.Drainer{
Inner: wh, Inner: wh,
QuietPeriod: wh.gracePeriod, QuietPeriod: wh.Options.GracePeriod,
} }
server := &http.Server{ server := &http.Server{

4
webhook/webhook_test.go
View File

@ -48,6 +48,9 @@ func newNonRunningTestWebhook(t *testing.T, options Options, acs ...interface{})
ctx context.Context, ac *Webhook, cancel context.CancelFunc) { ctx context.Context, ac *Webhook, cancel context.CancelFunc) {
t.Helper() t.Helper()
// override the grace period so it drains quickly
options.GracePeriod = 100 * time.Millisecond
// Create fake clients // Create fake clients
ctx, ctxCancel, informers := SetupFakeContextWithCancel(t) ctx, ctxCancel, informers := SetupFakeContextWithCancel(t)
ctx = WithOptions(ctx, options) ctx = WithOptions(ctx, options)
@ -65,7 +68,6 @@ func newNonRunningTestWebhook(t *testing.T, options Options, acs ...interface{})
if err != nil { if err != nil {
t.Fatal("Failed to create new admission controller:", err) t.Fatal("Failed to create new admission controller:", err)
} }
ac.gracePeriod = 100 * time.Millisecond
return return
} }