From 59e03a0c193f1ed2fa480c29a15a18cad8cf516b Mon Sep 17 00:00:00 2001 From: "Roland.Ma" Date: Sat, 9 Oct 2021 10:01:49 +0000 Subject: [PATCH] append status to all gateways Signed-off-by: Roland.Ma --- pkg/models/gateway/gateway.go | 10 +++++----- pkg/models/gateway/gateway_test.go | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkg/models/gateway/gateway.go b/pkg/models/gateway/gateway.go index 2d593503e..18108ca93 100644 --- a/pkg/models/gateway/gateway.go +++ b/pkg/models/gateway/gateway.go @@ -259,12 +259,12 @@ func (c *gatewayOperator) GetGateways(namespace string) ([]*v1alpha1.Gateway, er } obj := &v1alpha1.Gateway{} err := c.client.Get(context.TODO(), key, obj) - if errors.IsNotFound(err) { - return gateways, nil - } else if err != nil { + + if err == nil { + gateways = append(gateways, obj) + } else if err != nil && !errors.IsNotFound(err) { return nil, err } - gateways = append(gateways, obj) for _, g := range gateways { s := &corev1.Service{} @@ -281,7 +281,7 @@ func (c *gatewayOperator) GetGateways(namespace string) ([]*v1alpha1.Gateway, er } } - return gateways, err + return gateways, nil } // Create a Gateway in a namespace diff --git a/pkg/models/gateway/gateway_test.go b/pkg/models/gateway/gateway_test.go index 1b8efeb08..6a272566c 100644 --- a/pkg/models/gateway/gateway_test.go +++ b/pkg/models/gateway/gateway_test.go @@ -182,6 +182,9 @@ func Test_gatewayOperator_GetGateways(t *testing.T) { Type: corev1.ServiceTypeNodePort, }, }, + Status: runtime.RawExtension{ + Raw: []byte("{\"loadBalancer\":{},\"service\":[{\"name\":\"http\",\"protocol\":\"TCP\",\"port\":80,\"targetPort\":0}]}\n"), + }, }, }, },