OCPBUGS-5153: Sets query.sd-dns-resolver=miekgdns for thanos-querier and thanos-ruler #1858
Conversation
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]>
JoaoBraveCoding
changed the title
openshift-ci-robot
added
jira/valid-bug
|
@JoaoBraveCoding: This pull request references Jira Issue OCPBUGS-5153, which is valid. The bug has been moved to the POST state. 3 validation(s) were run on this bug
Requesting review from QA contact: The bug has been updated to refer to the pull request using the external bug tracker. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
@JoaoBraveCoding: This pull request references Jira Issue OCPBUGS-5153, which is valid. 3 validation(s) were run on this bug
Requesting review from QA contact: In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: JoaoBraveCoding The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
|
@JoaoBraveCoding: The following tests failed, say
Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
| @@ -20,7 +20,9 @@ spec: | |||
| key: alertmanagers.yaml | |||
| name: thanos-ruler-alertmanagers-config | |||
| containers: | |||
| - name: thanos-ruler | |||
| - args: | |||
There was a problem hiding this comment.
hmm, container's args generated by the operator would be overwritten, we probably need to add spec.additionalArgs to the ThanosRuler CRD first.
There was a problem hiding this comment.
| @@ -61,6 +61,7 @@ spec: | |||
| - --grpc-client-server-name=prometheus-grpc | |||
| - --rule=dnssrv+_grpc._tcp.prometheus-operated.openshift-monitoring.svc.cluster.local | |||
| - --target=dnssrv+_grpc._tcp.prometheus-operated.openshift-monitoring.svc.cluster.local | |||
| - --query.sd-dns-resolver=miekgdns | |||
There was a problem hiding this comment.
| - --query.sd-dns-resolver=miekgdns | |
| - --store.sd-dns-resolver=miekgdns |
There was a problem hiding this comment.
from https://github.com/openshift/cluster-monitoring-operator/blob/652eb9d657322c453b510ee4f2bb1cad305910a7/assets/thanos-querier/deployment.yaml
it seems @JoaoBraveCoding is right, - --store.sd-dns-resolver=miekgdns is in the code, the PR added - --query.sd-dns-resolver=miekgdns to code
- --store.sd-dns-resolver=miekgdns
- --grpc-client-tls-secure
- --grpc-client-tls-cert=/etc/tls/grpc/client.crt
- --grpc-client-tls-key=/etc/tls/grpc/client.key
- --grpc-client-tls-ca=/etc/tls/grpc/ca.crt
- --grpc-client-server-name=prometheus-grpc
- --rule=dnssrv+_grpc._tcp.prometheus-operated.openshift-monitoring.svc.cluster.local
- --target=dnssrv+_grpc._tcp.prometheus-operated.openshift-monitoring.svc.cluster.local
- --query.sd-dns-resolver=miekgdns
|
Closing this as we moved the change upstream thanos-io/thanos#5997, which should land in the next Thanos tag |
|
@JoaoBraveCoding: This pull request references Jira Issue OCPBUGS-5153. The bug has been updated to no longer refer to the pull request using the external bug tracker. All external bug links have been closed. The bug has been moved to the NEW state. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
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 repo.
Solution: migrate default to jsonnet
Signed-off-by: JoaoBraveCoding [email protected]