From 34fd9e9fefa8e796e32b08bf02290cd4ea8c0c7e Mon Sep 17 00:00:00 2001 From: irbekrm Date: Wed, 27 Jan 2021 13:32:23 +0000 Subject: [PATCH] Makes /cmd/cainjector/main more DRY reuses util.ContextWithStopCh to create a context with cancel func Signed-off-by: irbekrm --- cmd/cainjector/BUILD.bazel | 1 + cmd/cainjector/main.go | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/cmd/cainjector/BUILD.bazel b/cmd/cainjector/BUILD.bazel index fb58c847a..530a596b5 100644 --- a/cmd/cainjector/BUILD.bazel +++ b/cmd/cainjector/BUILD.bazel @@ -10,6 +10,7 @@ go_library( deps = [ "//cmd/cainjector/app:go_default_library", "//pkg/logs:go_default_library", + "//pkg/util:go_default_library", "//pkg/util/cmd:go_default_library", "@io_k8s_sigs_controller_runtime//:go_default_library", ], diff --git a/cmd/cainjector/main.go b/cmd/cainjector/main.go index 66544e813..9043df210 100644 --- a/cmd/cainjector/main.go +++ b/cmd/cainjector/main.go @@ -26,6 +26,7 @@ import ( "github.com/jetstack/cert-manager/cmd/cainjector/app" logf "github.com/jetstack/cert-manager/pkg/logs" + "github.com/jetstack/cert-manager/pkg/util" utilcmd "github.com/jetstack/cert-manager/pkg/util/cmd" ) @@ -37,12 +38,7 @@ func main() { // Set up signal handlers and a cancellable context which gets cancelled on // when either SIGINT or SIGTERM are received. stopCh := utilcmd.SetupSignalHandler() - ctx, cancel := context.WithCancel(context.Background()) - defer cancel() - go func() { - <-stopCh - cancel() - }() + ctx := util.ContextWithStopCh(context.Background(), stopCh) cmd := app.NewCommandStartInjectorController(ctx, os.Stdout, os.Stderr) cmd.Flags().AddGoFlagSet(flag.CommandLine)