fix metrics test for lsitener changes

Author: maltesander

tests/templates/kuttl/commons/check-metrics.py

@@ -68,17 +68,16 @@ def check_monitoring(hosts):
 if __name__ == "__main__":
     all_args = argparse.ArgumentParser(description="Test Trino metrics.")
     all_args.add_argument(
-        "-n", "--namespace", help="The namespace to run in", required=True
+        "-c", "--coordinator", help="The coordinator service name", required=True
     )
-    args = vars(all_args.parse_args())
-    namespace = args["namespace"]
-
-    host_coordinator_0 = f"trino-coordinator-default-0.trino-coordinator-default.{namespace}.svc.cluster.local"
-    host_worker_0 = (
-        f"trino-worker-default-0.trino-worker-default.{namespace}.svc.cluster.local"
+    all_args.add_argument(
+        "-w", "--worker", help="The worker service name", required=True
     )
+    args = vars(all_args.parse_args())
+    service_coordinator = args["coordinator"]
+    service_worker = args["worker"]
 
-    hosts = [host_coordinator_0, host_worker_0]
+    hosts = [service_coordinator, service_worker]
 
     check_monitoring(hosts)
 

tests/templates/kuttl/smoke/21-assert.yaml

@@ -6,4 +6,4 @@ commands:
   - script: kubectl exec -n $NAMESPACE trino-test-helper-0 -- python /tmp/check-active-workers.py -u admin -p admin -c trino-coordinator -w 1
   - script: kubectl exec -n $NAMESPACE trino-test-helper-0 -- python /tmp/check-opa.py -c trino-coordinator
   - script: kubectl exec -n $NAMESPACE trino-test-helper-0 -- python /tmp/check-s3.py -c trino-coordinator -b trino
-  - script: kubectl exec -n $NAMESPACE trino-test-helper-0 -- python /tmp/check-metrics.py -n $NAMESPACE
+  - script: kubectl exec -n $NAMESPACE trino-test-helper-0 -- python /tmp/check-metrics.py -c trino-coordinator-default-metrics -w trino-worker-default-metrics

tests/templates/kuttl/smoke_aws/21-assert.yaml

@@ -6,4 +6,4 @@ commands:
   - script: kubectl exec -n $NAMESPACE trino-test-helper-0 -- python /tmp/check-active-workers.py -u admin -p admin -c trino-coordinator-default -w 1
   - script: kubectl exec -n $NAMESPACE trino-test-helper-0 -- python /tmp/check-opa.py -c trino-coordinator-default
   - script: kubectl exec -n $NAMESPACE trino-test-helper-0 -- python /tmp/check-s3.py -c trino-coordinator-default -b my-bucket
-  - script: kubectl exec -n $NAMESPACE trino-test-helper-0 -- python /tmp/check-metrics.py -n $NAMESPACE
+  - script: kubectl exec -n $NAMESPACE trino-test-helper-0 -- python /tmp/check-metrics.py -c trino-coordinator-default-metrics -w trino-worker-default-metrics