From 5ea21fd27c7e0b5e11832916c16f9e2b255c98f1 Mon Sep 17 00:00:00 2001 From: Vacant Date: Sun, 14 Jul 2024 23:16:02 +0800 Subject: [PATCH] optimize Signed-off-by: Vacant2333 --- cmd/webhook-manager/app/server.go | 7 ++----- pkg/webhooks/router/admission.go | 2 ++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cmd/webhook-manager/app/server.go b/cmd/webhook-manager/app/server.go index 3178506725..9ccf065849 100644 --- a/cmd/webhook-manager/app/server.go +++ b/cmd/webhook-manager/app/server.go @@ -17,6 +17,7 @@ limitations under the License. package app import ( + "errors" "fmt" "net/http" "os" @@ -46,10 +47,6 @@ func Run(config *options.Config) error { } } - if config.WebhookURL == "" && config.WebhookNamespace == "" && config.WebhookName == "" { - return fmt.Errorf("failed to start webhooks as both 'url' and 'namespace/name' of webhook are empty") - } - restConfig, err := kube.BuildConfig(config.KubeClientOptions) if err != nil { return fmt.Errorf("unable to build k8s config: %v", err) @@ -101,7 +98,7 @@ func Run(config *options.Config) error { } go func() { err = server.ListenAndServeTLS("", "") - if err != nil && err != http.ErrServerClosed { + if err != nil && !errors.Is(err, http.ErrServerClosed) { klog.Fatalf("ListenAndServeTLS for admission webhook failed: %v", err) close(webhookServeError) } diff --git a/pkg/webhooks/router/admission.go b/pkg/webhooks/router/admission.go index 5b60d7025f..f0839289c1 100644 --- a/pkg/webhooks/router/admission.go +++ b/pkg/webhooks/router/admission.go @@ -58,6 +58,8 @@ func ForEachAdmission(config *options.Config, handler func(*AdmissionService) er if err := handler(service); err != nil { return err } + } else { + return fmt.Errorf("enabled admission %s not found on the admission registered map", admission) } } return nil