From ffc1aea306d1c4b7002b92890e2415d8a99b9fa5 Mon Sep 17 00:00:00 2001 From: hongzhouzi <36416216+hongzhouzi@users.noreply.github.com> Date: Fri, 17 Mar 2023 15:14:53 +0800 Subject: [PATCH] fix:Return cluster gateway duplicates (#5582) fix:Return cluster gateway duplicates. Signed-off-by: hongzhouzi --- pkg/models/gateway/gateway.go | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkg/models/gateway/gateway.go b/pkg/models/gateway/gateway.go index 3aa62f266..1506e24f3 100644 --- a/pkg/models/gateway/gateway.go +++ b/pkg/models/gateway/gateway.go @@ -261,17 +261,20 @@ func (c *gatewayOperator) GetGateways(namespace string) ([]*v1alpha1.Gateway, er gateways = append(gateways, g) } - key := types.NamespacedName{ - Namespace: c.getWorkingNamespace(namespace), - Name: fmt.Sprint(gatewayPrefix, namespace), - } - obj := &v1alpha1.Gateway{} - err := c.client.Get(context.TODO(), key, obj) + // Query non-cluster gateway + if namespace != globalGatewayNameSuffix { + key := types.NamespacedName{ + Namespace: c.getWorkingNamespace(namespace), + Name: fmt.Sprint(gatewayPrefix, namespace), + } + obj := &v1alpha1.Gateway{} + err := c.client.Get(context.TODO(), key, obj) - if err == nil { - gateways = append(gateways, obj) - } else if err != nil && !errors.IsNotFound(err) { - return nil, err + if err == nil { + gateways = append(gateways, obj) + } else if !errors.IsNotFound(err) { + return nil, err + } } for _, g := range gateways {