From b41391a4fab26518518bfbc550595e90956f8cd5 Mon Sep 17 00:00:00 2001 From: barnettZQG Date: Sat, 22 Oct 2022 12:38:08 +0800 Subject: [PATCH] Chore: wrong endpoint for LoadBalancer type service(revert #4729) (#4902) * Chore: wrong endpoint for LoadBalancer type service(revert #4729) Signed-off-by: barnettZQG * Fix: change the unit test Signed-off-by: barnettZQG Signed-off-by: barnettZQG --- pkg/velaql/providers/query/endpoint.go | 4 ++-- pkg/velaql/providers/query/endpoint_test.go | 8 ++++---- pkg/velaql/providers/query/handler_test.go | 10 +++++----- references/cli/velaql_test.go | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkg/velaql/providers/query/endpoint.go b/pkg/velaql/providers/query/endpoint.go index d287bcc5e..8a08e1236 100644 --- a/pkg/velaql/providers/query/endpoint.go +++ b/pkg/velaql/providers/query/endpoint.go @@ -211,10 +211,10 @@ func generatorFromService(service corev1.Service, selectorNodeIP func() string, appp := judgeAppProtocol(port.Port) for _, ingress := range service.Status.LoadBalancer.Ingress { if ingress.Hostname != "" { - serviceEndpoints = append(serviceEndpoints, formatEndpoint(ingress.Hostname, appp, port.Name, port.Protocol, port.NodePort, false)) + serviceEndpoints = append(serviceEndpoints, formatEndpoint(ingress.Hostname, appp, port.Name, port.Protocol, port.Port, false)) } if ingress.IP != "" { - serviceEndpoints = append(serviceEndpoints, formatEndpoint(ingress.IP, appp, port.Name, port.Protocol, port.NodePort, false)) + serviceEndpoints = append(serviceEndpoints, formatEndpoint(ingress.IP, appp, port.Name, port.Protocol, port.Port, false)) } } } diff --git a/pkg/velaql/providers/query/endpoint_test.go b/pkg/velaql/providers/query/endpoint_test.go index 9649debe0..d0c664e8a 100644 --- a/pkg/velaql/providers/query/endpoint_test.go +++ b/pkg/velaql/providers/query/endpoint_test.go @@ -167,7 +167,7 @@ var _ = Describe("Test Query Provider", func() { { "name": "seldon-ambassador-2", "ports": []corev1.ServicePort{ - {Port: 80, TargetPort: intstr.FromInt(80), Name: "80port", NodePort: 30010}, + {Port: 80, TargetPort: intstr.FromInt(80), Name: "80port"}, }, "type": corev1.ServiceTypeLoadBalancer, "status": corev1.ServiceStatus{ @@ -251,11 +251,11 @@ var _ = Describe("Test Query Provider", func() { Expect(err).Should(BeNil()) urls := []string{ - "http://1.1.1.1:30010/seldon/default/sdep2", + "http://1.1.1.1/seldon/default/sdep2", "http://clusterip-2.default", "clusterip-2.default:81", - "http://2.2.2.2:30020", - "http://1.1.1.1:30010", + "http://2.2.2.2:8080", + "http://1.1.1.1", } endValue, err := v.Field("list") Expect(err).Should(BeNil()) diff --git a/pkg/velaql/providers/query/handler_test.go b/pkg/velaql/providers/query/handler_test.go index 16eef7f8a..24d7f0754 100644 --- a/pkg/velaql/providers/query/handler_test.go +++ b/pkg/velaql/providers/query/handler_test.go @@ -946,13 +946,13 @@ options: { "https://ingress.domain.path/test", "https://ingress.domain.path/test2", fmt.Sprintf("http://%s:30229", gatewayIP), - "http://10.10.10.10:30080", - "http://text.example.com:30080", - "10.10.10.10:30081", - "text.example.com:30081", + "http://10.10.10.10", + "http://text.example.com", + "10.10.10.10:81", + "text.example.com:81", fmt.Sprintf("http://%s:30002", gatewayIP), "http://ingress.domain.helm", - "http://1.1.1.1:30011/seldon/default/sdep", + "http://1.1.1.1/seldon/default/sdep", "http://gateway.domain", "http://gateway.domain/api", "https://demo.kubevela.net", diff --git a/references/cli/velaql_test.go b/references/cli/velaql_test.go index cbbc293ae..14656c981 100644 --- a/references/cli/velaql_test.go +++ b/references/cli/velaql_test.go @@ -436,10 +436,10 @@ var _ = Describe("Test velaQL", func() { "https://ingress.domain.path/test", "https://ingress.domain.path/test2", fmt.Sprintf("http://%s:30229", gatewayIP), - "http://10.10.10.10:30180", - "http://text.example.com:30180", - "10.10.10.10:30181", - "text.example.com:30181", + "http://10.10.10.10", + "http://text.example.com", + "10.10.10.10:81", + "text.example.com:81", // helmRelease fmt.Sprintf("http://%s:30002", gatewayIP), "http://ingress.domain.helm",