Merge pull request #2626 from machine424/prep-thanos

MON-4299: chore(thanos): replace CLI args that will disappear in future versions

Author: openshift-merge-bot[bot]

assets/thanos-querier/deployment.yaml

@@ -60,8 +60,6 @@ spec:
         - --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
         env:
         - name: HOST_IP_ADDRESS
           valueFrom:

jsonnet/components/thanos-querier.libsonnet

@@ -370,8 +370,6 @@ function(params)
                   '--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',
                 ],
                 resources: {
                   requests: {

pkg/manifests/manifests.go

@@ -2882,11 +2882,8 @@ func (f *Factory) ThanosQuerierDeployment(grpcTLS *v1.Secret, enableUserWorkload
 			if enableUserWorkloadMonitoring {
 				d.Spec.Template.Spec.Containers[i].Args = append(
 					d.Spec.Template.Spec.Containers[i].Args,
-					"--store=dnssrv+_grpc._tcp.prometheus-operated.openshift-user-workload-monitoring.svc.cluster.local",
-					"--store=dnssrv+_grpc._tcp.thanos-ruler-operated.openshift-user-workload-monitoring.svc.cluster.local",
-					"--rule=dnssrv+_grpc._tcp.prometheus-operated.openshift-user-workload-monitoring.svc.cluster.local",
-					"--rule=dnssrv+_grpc._tcp.thanos-ruler-operated.openshift-user-workload-monitoring.svc.cluster.local",
-					"--target=dnssrv+_grpc._tcp.prometheus-operated.openshift-user-workload-monitoring.svc.cluster.local",
+					"--endpoint=dnssrv+_grpc._tcp.prometheus-operated.openshift-user-workload-monitoring.svc.cluster.local",
+					"--endpoint=dnssrv+_grpc._tcp.thanos-ruler-operated.openshift-user-workload-monitoring.svc.cluster.local",
 				)
 			}