diff --git a/cmd/webhook/app/testing/testwebhook.go b/cmd/webhook/app/testing/testwebhook.go index 62211fb53..b83ee41b8 100644 --- a/cmd/webhook/app/testing/testwebhook.go +++ b/cmd/webhook/app/testing/testwebhook.go @@ -99,7 +99,7 @@ func StartWebhookServer(t *testing.T, ctx context.Context, args []string, argume webhookConfig.HealthzPort = pointer.Int(0) errCh := make(chan error) - srv, err := webhook.NewCertManagerWebhookServer(log, *webhookFlags, *webhookConfig, argumentsForNewServerWithOptions...) + srv, err := webhook.NewCertManagerWebhookServer(log, *webhookConfig, argumentsForNewServerWithOptions...) if err != nil { t.Fatal(err) } diff --git a/cmd/webhook/app/webhook.go b/cmd/webhook/app/webhook.go index 137c7337a..b42f4fc11 100644 --- a/cmd/webhook/app/webhook.go +++ b/cmd/webhook/app/webhook.go @@ -117,7 +117,7 @@ func NewServerCommand(stopCh <-chan struct{}) *cobra.Command { } } - srv, err := cmwebhook.NewCertManagerWebhookServer(log, *webhookFlags, *webhookConfig) + srv, err := cmwebhook.NewCertManagerWebhookServer(log, *webhookConfig) if err != nil { log.Error(err, "Failed initialising server") os.Exit(1) diff --git a/internal/webhook/webhook.go b/internal/webhook/webhook.go index e3ec30acf..d2bbddce8 100644 --- a/internal/webhook/webhook.go +++ b/internal/webhook/webhook.go @@ -27,7 +27,6 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - "github.com/cert-manager/cert-manager/cmd/webhook/app/options" acmeinstall "github.com/cert-manager/cert-manager/internal/apis/acme/install" cminstall "github.com/cert-manager/cert-manager/internal/apis/certmanager/install" config "github.com/cert-manager/cert-manager/internal/apis/config/webhook" @@ -54,7 +53,7 @@ func WithConversionHandler(handler handlers.ConversionHook) func(*server.Server) // NewCertManagerWebhookServer creates a new webhook server configured with all cert-manager // resource types, validation, defaulting and conversion functions. -func NewCertManagerWebhookServer(log logr.Logger, _ options.WebhookFlags, opts config.WebhookConfiguration, optionFunctions ...func(*server.Server)) (*server.Server, error) { +func NewCertManagerWebhookServer(log logr.Logger, opts config.WebhookConfiguration, optionFunctions ...func(*server.Server)) (*server.Server, error) { restcfg, err := clientcmd.BuildConfigFromFlags(opts.APIServerHost, opts.KubeConfig) if err != nil { return nil, err