From 570fb378a579813ee196c49fb19595c20840aacf Mon Sep 17 00:00:00 2001
From: Marcin Maciaszczyk <marcin9yk@icloud.com>
Date: Mon, 30 Jun 2025 09:58:35 +0200
Subject: [PATCH] call RunWebhookServer from
 github.com/cert-manager/cert-manager/pkg/acme/webhook/cmd package

---
 main.go        |  2 +-
 pkg/cmd/cmd.go | 37 -------------------------------------
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 pkg/cmd/cmd.go

diff --git a/main.go b/main.go
index b5a98d1..ecc1966 100644
--- a/main.go
+++ b/main.go
@@ -6,7 +6,7 @@ import (
 	"os"
 
 	"github.com/cert-manager/cert-manager/pkg/acme/webhook/apis/acme/v1alpha1"
-	"github.com/pluralsh/plural-certmanager-webhook/pkg/cmd"
+	"github.com/cert-manager/cert-manager/pkg/acme/webhook/cmd"
 	"github.com/pluralsh/plural-certmanager-webhook/plural"
 	extapi "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/client-go/rest"
diff --git a/pkg/cmd/cmd.go b/pkg/cmd/cmd.go
deleted file mode 100644
index 555db60..0000000
--- a/pkg/cmd/cmd.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package cmd
-
-import (
-	"flag"
-	"os"
-	"runtime"
-
-	"github.com/cert-manager/cert-manager/cmd/util"
-	"github.com/cert-manager/cert-manager/pkg/acme/webhook"
-	logf "github.com/cert-manager/cert-manager/pkg/logs"
-	"github.com/pluralsh/plural-certmanager-webhook/pkg/server"
-	"k8s.io/component-base/logs"
-)
-
-// RunWebhookServer creates and starts a new apiserver that acts as a external
-// webhook server for solving DNS challenges using the provided solver
-// implementations. This can be used as an entry point by external webhook
-// implementations, see
-// https://github.com/cert-manager/webhook-example/blob/899c408751425f8d0842b61c0e62fd8035d00316/main.go#L23-L31
-func RunWebhookServer(groupName string, hooks ...webhook.Solver) {
-	stopCh, exit := util.SetupExitHandler(util.GracefulShutdown)
-	defer exit() // This function might call os.Exit, so defer last
-
-	logs.InitLogs()
-	defer logs.FlushLogs()
-
-	if len(os.Getenv("GOMAXPROCS")) == 0 {
-		runtime.GOMAXPROCS(runtime.NumCPU())
-	}
-
-	cmd := server.NewCommandStartWebhookServer(os.Stdout, os.Stderr, stopCh, groupName, hooks...)
-	cmd.Flags().AddGoFlagSet(flag.CommandLine)
-	if err := cmd.Execute(); err != nil {
-		logf.Log.Error(err, "error executing command")
-		util.SetExitCode(err)
-	}
-}