Keep shutdown timeout

pkg/webhook/server.go

@@ -250,20 +250,15 @@ func (s *DefaultServer) Start(ctx context.Context) error {
 	idleConnsClosed := make(chan struct{})
 	go func() {
 		<-ctx.Done()
-		log.Info("Shutting down webhook server with timeout of 1 minute")
-		ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
-		defer cancel()
 		// Disable HTTP keep-alives to close persistent connections after next
 		// HTTP request. Clients may reconnect until routes are updated and
 		// server listeners are closed however this should start gradually
 		// migrating clients to server instances that are not about to shutdown
 		srv.SetKeepAlivesEnabled(false)
-		// Wait for the specified shutdown delay or until the shutdown context
-		// expires, whichever happens first
-		select {
-		case <-time.After(s.Options.ShutdownDelay):
-		case <-ctx.Done():
-		}
+		<-time.After(s.Options.ShutdownDelay)
+		log.Info("Shutting down webhook server with timeout of 1 minute")
+		ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
+		defer cancel()
 		if err := srv.Shutdown(ctx); err != nil {
 			// Error from closing listeners, or context timeout
 			log.Error(err, "error shutting down the HTTP server")