From d45847d302fa9efad2c4fa94fc45102b4c0b0689 Mon Sep 17 00:00:00 2001 From: JoshVanL Date: Fri, 26 Jun 2020 13:36:40 +0100 Subject: [PATCH] Reverse webhook cmd run parameters Signed-off-by: JoshVanL --- cmd/webhook/app/BUILD.bazel | 1 + cmd/webhook/app/testing/testwebhook.go | 2 +- cmd/webhook/app/webhook.go | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/cmd/webhook/app/BUILD.bazel b/cmd/webhook/app/BUILD.bazel index 4231b3529..298a5786d 100644 --- a/cmd/webhook/app/BUILD.bazel +++ b/cmd/webhook/app/BUILD.bazel @@ -14,6 +14,7 @@ go_library( "//pkg/webhook/handlers:go_default_library", "//pkg/webhook/server:go_default_library", "//pkg/webhook/server/tls:go_default_library", + "@com_github_go_logr_logr//:go_default_library", "@com_github_spf13_cobra//:go_default_library", "@io_k8s_client_go//tools/clientcmd:go_default_library", ], diff --git a/cmd/webhook/app/testing/testwebhook.go b/cmd/webhook/app/testing/testwebhook.go index ad942967f..1abe364d3 100644 --- a/cmd/webhook/app/testing/testwebhook.go +++ b/cmd/webhook/app/testing/testwebhook.go @@ -91,7 +91,7 @@ func StartWebhookServer(t *testing.T, args []string) (ServerOptions, StopFunc) { opts.HealthzPort = 0 stopCh := make(chan struct{}) - srv, err := app.NewServer(opts, stopCh) + srv, err := app.NewServerWithOptions(log, opts) if err != nil { t.Fatal(err) } diff --git a/cmd/webhook/app/webhook.go b/cmd/webhook/app/webhook.go index 22120fd69..05f511968 100644 --- a/cmd/webhook/app/webhook.go +++ b/cmd/webhook/app/webhook.go @@ -20,11 +20,11 @@ import ( "context" "fmt" + "github.com/go-logr/logr" "github.com/spf13/cobra" "k8s.io/client-go/tools/clientcmd" "github.com/jetstack/cert-manager/cmd/webhook/app/options" - "github.com/jetstack/cert-manager/pkg/logs" logf "github.com/jetstack/cert-manager/pkg/logs" "github.com/jetstack/cert-manager/pkg/util" "github.com/jetstack/cert-manager/pkg/webhook" @@ -34,15 +34,11 @@ import ( "github.com/jetstack/cert-manager/pkg/webhook/server/tls" ) -var validationHook handlers.ValidatingAdmissionHook = handlers.NewRegistryBackedValidator(logs.Log, webhook.Scheme, webhook.ValidationRegistry) -var mutationHook handlers.MutatingAdmissionHook = handlers.NewSchemeBackedDefaulter(logs.Log, webhook.Scheme) -var conversionHook handlers.ConversionHook = handlers.NewSchemeBackedConverter(logs.Log, webhook.Scheme) - -func NewServer(opts options.WebhookOptions, stopCh <-chan struct{}) (*server.Server, error) { - rootCtx := util.ContextWithStopCh(context.Background(), stopCh) - rootCtx = logf.NewContext(rootCtx, nil, "webhook") - log := logf.FromContext(rootCtx) +var validationHook handlers.ValidatingAdmissionHook = handlers.NewRegistryBackedValidator(logf.Log, webhook.Scheme, webhook.ValidationRegistry) +var mutationHook handlers.MutatingAdmissionHook = handlers.NewSchemeBackedDefaulter(logf.Log, webhook.Scheme) +var conversionHook handlers.ConversionHook = handlers.NewSchemeBackedConverter(logf.Log, webhook.Scheme) +func NewServerWithOptions(log logr.Logger, opts options.WebhookOptions) (*server.Server, error) { var source tls.CertificateSource switch { case options.FileTLSSourceEnabled(opts): @@ -94,7 +90,11 @@ func NewServerCommand(stopCh <-chan struct{}) *cobra.Command { Use: "webhook", Short: fmt.Sprintf("Webhook component providing API validation, mutation and conversion functionality for cert-manager (%s) (%s)", util.AppVersion, util.AppGitCommit), RunE: func(cmd *cobra.Command, args []string) error { - srv, err := NewServer(opts, stopCh) + ctx := util.ContextWithStopCh(context.Background(), stopCh) + ctx = logf.NewContext(ctx, nil, "webhook") + log := logf.FromContext(ctx) + + srv, err := NewServerWithOptions(log, opts) if err != nil { return err }