From debd16ee8c8f12d246fe50316507f2e185ed8335 Mon Sep 17 00:00:00 2001 From: frezes Date: Mon, 28 Jul 2025 18:34:39 +0800 Subject: [PATCH] update query endpoint Signed-off-by: frezes --- .../monitoring/resources/ingester/ingester.go | 4 ++++ .../monitoring/resources/query/deployment.go | 11 +++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkg/controllers/monitoring/resources/ingester/ingester.go b/pkg/controllers/monitoring/resources/ingester/ingester.go index fbc61687..b9bfa16b 100644 --- a/pkg/controllers/monitoring/resources/ingester/ingester.go +++ b/pkg/controllers/monitoring/resources/ingester/ingester.go @@ -45,6 +45,10 @@ func (r *Ingester) meta(name string) metav1.ObjectMeta { } } +func (r *Ingester) Endpoints() []string { + return []string{fmt.Sprintf("dnssrv+_grpc._tcp.%s.%s.svc", r.name(constants.ServiceNameSuffix), r.ingester.Namespace)} +} + func (r *Ingester) GrpcAddrs() []string { var addrs []string if r.ingester.Spec.Replicas != nil { diff --git a/pkg/controllers/monitoring/resources/query/deployment.go b/pkg/controllers/monitoring/resources/query/deployment.go index 5b613977..cbf1aba9 100644 --- a/pkg/controllers/monitoring/resources/query/deployment.go +++ b/pkg/controllers/monitoring/resources/query/deployment.go @@ -187,7 +187,7 @@ func (q *Query) deployment() (runtime.Object, resources.Operation, error) { if err != nil { return nil, "", err } - for _, endpoint := range ingesterInstance.GrpcAddrs() { + for _, endpoint := range ingesterInstance.Endpoints() { queryContainer.Args = append(queryContainer.Args, "--endpoint="+endpoint) } } @@ -216,7 +216,7 @@ func (q *Query) deployment() (runtime.Object, resources.Operation, error) { partitionName = util.Join("-", constants.AppNameStore, item.Name, "partition", strconv.Itoa(i), constants.ServiceNameSuffix) } - endpoint := fmt.Sprintf("%s.%s.svc:%d", partitionName, item.Namespace, constants.GRPCPort) + endpoint := fmt.Sprintf("dnssrv+_grpc._tcp.%s.%s.svc", partitionName, item.Namespace) queryContainer.Args = append(queryContainer.Args, "--endpoint="+endpoint) } } @@ -237,10 +237,9 @@ func (q *Query) deployment() (runtime.Object, resources.Operation, error) { shards = *item.Spec.Shards } for shardSn := 0; shardSn < int(shards); shardSn++ { - addr := fmt.Sprintf("%s.%s.svc:%d", - q.QualifiedName(constants.AppNameRuler, item.Name, strconv.Itoa(shardSn), constants.ServiceNameSuffix), - item.Namespace, constants.GRPCPort) - queryContainer.Args = append(queryContainer.Args, "--endpoint="+addr) + endpoint := fmt.Sprintf("dnssrv+_grpc._tcp.%s.%s.svc", + q.QualifiedName(constants.AppNameRuler, item.Name, strconv.Itoa(shardSn), constants.ServiceNameSuffix), item.Namespace) + queryContainer.Args = append(queryContainer.Args, "--endpoint="+endpoint) } }