Skip to content

[cherry-pick] update query endpoint #708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
junotx merged 1 commit into from
Jul 29, 2025
Merged

[cherry-pick] update query endpoint #708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkg/controllers/monitoring/resources/ingester/ingester.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
11 changes: 5 additions & 6 deletions pkg/controllers/monitoring/resources/query/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Expand Down Expand Up @@ -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)
}
}
Expand All @@ -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)
}
}

Expand Down