Skip to content

Commit c35c759

Browse files
committed
MON-4299: chore(thanos): replace CLI args that will disappear in future versions
--endpoint itself is deprecated now https://github.com/thanos-io/thanos/pull/7890/files but we can live with it for a moment needed for openshift/thanos#163 Some are leftovers from https://github.com/openshift/cluster-monitoring-operator/pull/1961/files
1 parent d59e266 commit c35c759

File tree

3 files changed

+2
-9
lines changed

3 files changed

+2
-9
lines changed

assets/thanos-querier/deployment.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ spec:
6060
- --grpc-client-tls-key=/etc/tls/grpc/client.key
6161
- --grpc-client-tls-ca=/etc/tls/grpc/ca.crt
6262
- --grpc-client-server-name=prometheus-grpc
63-
- --rule=dnssrv+_grpc._tcp.prometheus-operated.openshift-monitoring.svc.cluster.local
64-
- --target=dnssrv+_grpc._tcp.prometheus-operated.openshift-monitoring.svc.cluster.local
6563
env:
6664
- name: HOST_IP_ADDRESS
6765
valueFrom:

jsonnet/components/thanos-querier.libsonnet

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,6 @@ function(params)
370370
'--grpc-client-tls-key=/etc/tls/grpc/client.key',
371371
'--grpc-client-tls-ca=/etc/tls/grpc/ca.crt',
372372
'--grpc-client-server-name=prometheus-grpc',
373-
'--rule=dnssrv+_grpc._tcp.prometheus-operated.openshift-monitoring.svc.cluster.local',
374-
'--target=dnssrv+_grpc._tcp.prometheus-operated.openshift-monitoring.svc.cluster.local',
375373
],
376374
resources: {
377375
requests: {

pkg/manifests/manifests.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2882,11 +2882,8 @@ func (f *Factory) ThanosQuerierDeployment(grpcTLS *v1.Secret, enableUserWorkload
28822882
if enableUserWorkloadMonitoring {
28832883
d.Spec.Template.Spec.Containers[i].Args = append(
28842884
d.Spec.Template.Spec.Containers[i].Args,
2885-
"--store=dnssrv+_grpc._tcp.prometheus-operated.openshift-user-workload-monitoring.svc.cluster.local",
2886-
"--store=dnssrv+_grpc._tcp.thanos-ruler-operated.openshift-user-workload-monitoring.svc.cluster.local",
2887-
"--rule=dnssrv+_grpc._tcp.prometheus-operated.openshift-user-workload-monitoring.svc.cluster.local",
2888-
"--rule=dnssrv+_grpc._tcp.thanos-ruler-operated.openshift-user-workload-monitoring.svc.cluster.local",
2889-
"--target=dnssrv+_grpc._tcp.prometheus-operated.openshift-user-workload-monitoring.svc.cluster.local",
2885+
"--endpoint=dnssrv+_grpc._tcp.prometheus-operated.openshift-user-workload-monitoring.svc.cluster.local",
2886+
"--endpoint=dnssrv+_grpc._tcp.thanos-ruler-operated.openshift-user-workload-monitoring.svc.cluster.local",
28902887
)
28912888
}
28922889

0 commit comments

Comments
 (0)