From 1b8796e33e5c4fd8be850802eff938377893e4df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=AF=E8=88=AA?= <101104760+ZhangSetSail@users.noreply.github.com> Date: Thu, 21 Nov 2024 19:33:55 +0800 Subject: [PATCH] fix: delete route failure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张启航 <101104760+ZhangSetSail@users.noreply.github.com> --- .../apigateway/api_gateway_route.go | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/api/controller/apigateway/api_gateway_route.go b/api/controller/apigateway/api_gateway_route.go index 1d8cea772..ca8b09426 100644 --- a/api/controller/apigateway/api_gateway_route.go +++ b/api/controller/apigateway/api_gateway_route.go @@ -248,6 +248,7 @@ func (g Struct) CreateHTTPAPIRoute(w http.ResponseWriter, r *http.Request) { }, v1.CreateOptions{}) if err == nil { name := r.URL.Query().Get("name") + name = name[1:] if name != "" { err = c.ApisixRoutes(tenant.Namespace).Delete(r.Context(), name, v1.DeleteOptions{}) if err != nil { @@ -302,7 +303,7 @@ func (g Struct) DeleteHTTPAPIRoute(w http.ResponseWriter, r *http.Request) { var deleteName = make([]string, 0) tenant := r.Context().Value(ctxutil.ContextKey("tenant")).(*dbmodel.Tenants) name := chi.URLParam(r, "name") - + name = name[1:] c := k8s.Default().ApiSixClient.ApisixV2() err := c.ApisixRoutes(tenant.Namespace).Delete(r.Context(), name, v1.DeleteOptions{}) @@ -311,24 +312,6 @@ func (g Struct) DeleteHTTPAPIRoute(w http.ResponseWriter, r *http.Request) { httputil.ReturnSuccess(r, w, deleteName) return } - if errors.IsNotFound(err) { - list, _ := c.ApisixRoutes(tenant.Namespace).List(r.Context(), v1.ListOptions{ - LabelSelector: "host=" + name, - }) - - for _, item := range list.Items { - err = c.ApisixRoutes(tenant.Namespace).Delete(r.Context(), item.Spec.HTTP[0].Name, v1.DeleteOptions{}) - if err != nil { - logrus.Errorf("delete route %v failure: %v", item.Name, err) - httputil.ReturnBcodeError(r, w, bcode.ErrRouteDelete) - return - } - deleteName = append(deleteName, item.Spec.HTTP[0].Name) - - } - httputil.ReturnSuccess(r, w, deleteName) - return - } logrus.Errorf("delete route error %s", err.Error()) httputil.ReturnBcodeError(r, w, bcode.ErrRouteDelete) }