From cfee74b0e62d23817fa5bfd8aeb44d929ab0a5f1 Mon Sep 17 00:00:00 2001 From: Sergey Yedrikov Date: Mon, 29 Apr 2019 12:24:28 -0400 Subject: [PATCH] Fix for https://github.com/knative/eventing/issues/1109 [BUG] eventing controller and source-controller fall off main() on shutdown signal --- cmd/controller/main.go | 3 +-- cmd/sources-controller/main.go | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/cmd/controller/main.go b/cmd/controller/main.go index 1addab462cd..c6f0c7b7a55 100644 --- a/cmd/controller/main.go +++ b/cmd/controller/main.go @@ -167,8 +167,7 @@ func main() { // Start all of the controllers. logger.Info("Starting controllers.") - go kncontroller.StartAll(stopCh, controllers...) - <-stopCh + kncontroller.StartAll(stopCh, controllers...) } func init() { diff --git a/cmd/sources-controller/main.go b/cmd/sources-controller/main.go index 000cbf04c4a..2f5055a5b04 100644 --- a/cmd/sources-controller/main.go +++ b/cmd/sources-controller/main.go @@ -121,9 +121,7 @@ func main() { // Start all of the controllers. logger.Info("Starting controllers.") - go kncontroller.StartAll(stopCh, controllers...) - - <-stopCh + kncontroller.StartAll(stopCh, controllers...) } func setupLogger() (*zap.SugaredLogger, zap.AtomicLevel) {