From ac8d27126165c9e78d52a31fab2e20512c8912b2 Mon Sep 17 00:00:00 2001 From: kerthcet Date: Fri, 28 Jan 2022 10:17:38 +0800 Subject: [PATCH] bug: webhook's os.Exit will not wait for the defer function Signed-off-by: kerthcet --- cmd/webhook/main.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/cmd/webhook/main.go b/cmd/webhook/main.go index 9888650d6..af9a0c417 100644 --- a/cmd/webhook/main.go +++ b/cmd/webhook/main.go @@ -1,7 +1,6 @@ package main import ( - "fmt" "os" apiserver "k8s.io/apiserver/pkg/server" @@ -11,13 +10,19 @@ import ( ) func main() { + if err := runWebhookCmd(); err != nil { + os.Exit(1) + } +} + +func runWebhookCmd() error { logs.InitLogs() defer logs.FlushLogs() ctx := apiserver.SetupSignalContext() - if err := app.NewWebhookCommand(ctx).Execute(); err != nil { - fmt.Fprintf(os.Stderr, "%v\n", err) - os.Exit(1) + return err } + + return nil }