Skip to content

fix: webhook server initialization #332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 19, 2025
Merged

fix: webhook server initialization #332

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
661c21e
Fix webhook server initialization
pbzweihander Sep 17, 2025
3b3c76e
Add error handling for webhook server
pbzweihander Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions cmd/operator/app/command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -100,8 +92,18 @@ 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)
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")
os.Exit(1)
Expand Down