From 86d6517a5dc5df3a291f2a539b05a9d97e62b656 Mon Sep 17 00:00:00 2001 From: Gabriel Adrian Samfira Date: Wed, 5 Feb 2025 20:10:02 +0000 Subject: [PATCH] Relax URLs validation Webhook URL was not mandatory in previous versions. While it is needed if users plan to use the install webhook feature, it is not required if you want to install it yourself. Signed-off-by: Gabriel Adrian Samfira --- apiserver/params/params.go | 2 +- auth/init_required.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apiserver/params/params.go b/apiserver/params/params.go index 6e46190e..7aee3bd2 100644 --- a/apiserver/params/params.go +++ b/apiserver/params/params.go @@ -39,6 +39,6 @@ var ( // URLsRequired is returned if the controller does not have the required URLs URLsRequired = APIErrorResponse{ Error: "urls_required", - Details: "Missing required URLs. Make sure you update the metadata, callback and webhook URLs", + Details: "Missing required URLs. Make sure you update the metadata and callback URLs", } ) diff --git a/auth/init_required.go b/auth/init_required.go index 6b369a6c..2d3e1715 100644 --- a/auth/init_required.go +++ b/auth/init_required.go @@ -66,7 +66,7 @@ func (u *urlsRequired) Middleware(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { ctx := r.Context() ctrlInfo, err := u.store.ControllerInfo() - if err != nil || ctrlInfo.WebhookURL == "" || ctrlInfo.MetadataURL == "" || ctrlInfo.CallbackURL == "" { + if err != nil || ctrlInfo.MetadataURL == "" || ctrlInfo.CallbackURL == "" { w.Header().Add("Content-Type", "application/json") w.WriteHeader(http.StatusConflict) if err := json.NewEncoder(w).Encode(params.URLsRequired); err != nil {