Skip to content

Commit 652eb9d

Browse files
Sets query.sd-dns-resolver=miekgdns for thanos-querier and thanos-ruler
Issue: https://issues.redhat.com/browse/OCPBUGS-5153 Problem: a downstream commit was made to make this the default because of https://bugzilla.redhat.com/show_bug.cgi?id=1953518. However, this commit conflicts when updating the downstream brach. Solution: migrate default to jsonnet Signed-off-by: JoaoBraveCoding <[email protected]>
1 parent c20285b commit 652eb9d

File tree

4 files changed

+14
-1
lines changed

4 files changed

+14
-1
lines changed

Diff for: assets/thanos-querier/deployment.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ spec:
6161
- --grpc-client-server-name=prometheus-grpc
6262
- --rule=dnssrv+_grpc._tcp.prometheus-operated.openshift-monitoring.svc.cluster.local
6363
- --target=dnssrv+_grpc._tcp.prometheus-operated.openshift-monitoring.svc.cluster.local
64+
- --query.sd-dns-resolver=miekgdns
6465
env:
6566
- name: HOST_IP_ADDRESS
6667
valueFrom:

Diff for: assets/thanos-ruler/thanos-ruler.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ spec:
2020
key: alertmanagers.yaml
2121
name: thanos-ruler-alertmanagers-config
2222
containers:
23-
- name: thanos-ruler
23+
- args:
24+
- --query.sd-dns-resolver=miekgdns
25+
name: thanos-ruler
2426
securityContext:
2527
allowPrivilegeEscalation: false
2628
capabilities:

Diff for: jsonnet/components/thanos-querier.libsonnet

+4
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,10 @@ function(params)
356356
'--grpc-client-server-name=prometheus-grpc',
357357
'--rule=dnssrv+_grpc._tcp.prometheus-operated.openshift-monitoring.svc.cluster.local',
358358
'--target=dnssrv+_grpc._tcp.prometheus-operated.openshift-monitoring.svc.cluster.local',
359+
// The native Go resolver fails to parse compressed responses for SRV records.
360+
// The miekgdns resolver doesn't suffer the same issue hence defaulting to it instead.
361+
// See https://bugzilla.redhat.com/show_bug.cgi?id=1953518
362+
'--query.sd-dns-resolver=miekgdns',
359363
],
360364
resources: {
361365
requests: {

Diff for: jsonnet/components/thanos-ruler.libsonnet

+6
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,12 @@ function(params)
385385
// Note: this is performing strategic-merge-patch for thanos-ruler container.
386386
// Remainder of the container configuration is managed by prometheus-operator based on $.thanosRuler.spec
387387
name: tr.config.name,
388+
args: [
389+
// The native Go resolver fails to parse compressed responses for SRV records.
390+
// The miekgdns resolver doesn't suffer the same issue hence defaulting to it instead.
391+
// See https://bugzilla.redhat.com/show_bug.cgi?id=1953518
392+
'--query.sd-dns-resolver=miekgdns',
393+
],
388394
terminationMessagePolicy: 'FallbackToLogsOnError',
389395
volumeMounts: [
390396
{

0 commit comments

Comments
 (0)