From 661c21e63de3c9fcd17b220108b0598b9431867d Mon Sep 17 00:00:00 2001 From: pbzweihander Date: Wed, 17 Sep 2025 21:03:32 +0900 Subject: [PATCH 1/2] Fix webhook server initialization Signed-off-by: pbzweihander --- cmd/operator/app/command.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/cmd/operator/app/command.go b/cmd/operator/app/command.go index 205019cf..6261d2fb 100644 --- a/cmd/operator/app/command.go +++ b/cmd/operator/app/command.go @@ -84,14 +84,6 @@ func NewOperatorCommand() *cobra.Command { setupLog := ctrl.Log.WithName("setup") cfg := ctrl.GetConfigOrDie() - webhookServer := webhook.NewServer(webhook.Options{}) - if o.EnableAdmissionWebhook { - webhookServerOptions := webhook.Options{ - Port: o.AdmissionWebhookPort, - CertDir: o.AdmissionWebhookCertDir, - } - webhookServer = webhook.NewServer(webhookServerOptions) - } mgr, err := ctrl.NewManager(cfg, ctrl.Options{ Scheme: scheme, HealthProbeBindAddress: o.HealthProbeAddr, @@ -100,8 +92,15 @@ func NewOperatorCommand() *cobra.Command { Metrics: metricsserver.Options{ BindAddress: o.MetricsAddr, }, - WebhookServer: webhookServer, }) + if o.EnableAdmissionWebhook { + webhookServerOptions := webhook.Options{ + Port: o.AdmissionWebhookPort, + CertDir: o.AdmissionWebhookCertDir, + } + webhookServer := webhook.NewServer(webhookServerOptions) + mgr.Add(webhookServer) + } if err != nil { setupLog.Error(err, "unable to start manager") os.Exit(1) From 3b3c76e4f48a8a33cd2487aa2af763ab397b525e Mon Sep 17 00:00:00 2001 From: pbzweihander Date: Thu, 18 Sep 2025 16:42:47 +0900 Subject: [PATCH 2/2] Add error handling for webhook server Signed-off-by: pbzweihander --- cmd/operator/app/command.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/operator/app/command.go b/cmd/operator/app/command.go index 6261d2fb..3de76fe5 100644 --- a/cmd/operator/app/command.go +++ b/cmd/operator/app/command.go @@ -99,7 +99,10 @@ func NewOperatorCommand() *cobra.Command { CertDir: o.AdmissionWebhookCertDir, } webhookServer := webhook.NewServer(webhookServerOptions) - mgr.Add(webhookServer) + if err := mgr.Add(webhookServer); err != nil { + setupLog.Error(err, "unable to add admission webhook server to manager") + os.Exit(1) + } } if err != nil { setupLog.Error(err, "unable to start manager")