rename headless service

Author: labrenbe

rust/operator-binary/src/crd/mod.rs

@@ -472,7 +472,7 @@ impl v1alpha1::DruidCluster {
 
     /// The name of the role-level load-balanced Kubernetes `Service`
     pub fn role_service_name(&self, role: &DruidRole) -> Option<String> {
-        Some(format!("{}-{}-metrics", self.metadata.name.clone()?, role))
+        Some(format!("{}-{}-headless", self.metadata.name.clone()?, role))
     }
 
     /// The fully-qualified domain name of the role-level load-balanced Kubernetes `Service`
@@ -1682,12 +1682,12 @@ mod tests {
 
         assert_eq!(
             cluster.role_service_name(&DruidRole::Router),
-            Some("testcluster-router-metrics".to_string())
+            Some("testcluster-router-headless".to_string())
         );
 
         assert_eq!(
             cluster.role_service_fqdn(&DruidRole::Router, &dummy_cluster_info),
-            Some("testcluster-router-metrics.default.svc.cluster.local".to_string())
+            Some("testcluster-router-headless.default.svc.cluster.local".to_string())
         )
     }
 

rust/operator-binary/src/druid_controller.rs

@@ -843,7 +843,7 @@ fn build_rolegroup_config_map(
 }
 
 pub fn rolegroup_service_name(rolegroup: &RoleGroupRef<v1alpha1::DruidCluster>) -> String {
-    format!("{name}-metrics", name = rolegroup.object_name())
+    format!("{name}-headless", name = rolegroup.object_name())
 }
 
 /// The rolegroup [`Service`] is a headless service that allows direct access to the instances of a certain rolegroup

tests/templates/kuttl/authorizer/authcheck.py

@@ -2,7 +2,7 @@
 import sys
 import logging
 
-coordinator_host = "derby-druid-coordinator-default-metrics"
+coordinator_host = "derby-druid-coordinator-default-headless"
 coordinator_port = "8281"
 authenticator_name = "MyBasicMetadataAuthenticator"
 
@@ -52,7 +52,7 @@ def create_user(user_name):
     }
 
     for role, port in druid_role_ports.items():
-        url = f"https://{druid_cluster_name}-{role}-default-metrics:{port}/status"
+        url = f"https://{druid_cluster_name}-{role}-default-headless:{port}/status"
         # make an authorized request -> return 401 expected
         print("Checking Unauthorized")
         res = requests.get(url, verify=False)

tests/templates/kuttl/commons/healthcheck.py

@@ -25,7 +25,7 @@
 
     for role, port in druid_role_ports.items():
         url = (
-            f"https://{druid_cluster_name}-{role}-default-metrics:{port}/status/health"
+            f"https://{druid_cluster_name}-{role}-default-headless:{port}/status/health"
         )
         count = 1
 

tests/templates/kuttl/commons/ingestioncheck-tls.py

@@ -94,7 +94,7 @@ def query_datasource(self, url, sql, expected, iterations):
 Query tasks
 ===========""")
 tasks = druid.get_tasks(
-    url=f"{protocol}://{druid_cluster_name}-coordinator-default-0.{druid_cluster_name}-coordinator-default-metrics.{namespace}.svc.cluster.local:{coordinator_port}/druid/indexer/v1/tasks",
+    url=f"{protocol}://{druid_cluster_name}-coordinator-default-0.{druid_cluster_name}-coordinator-default-headless.{namespace}.svc.cluster.local:{coordinator_port}/druid/indexer/v1/tasks",
 )
 task_count = len(json.loads(tasks))
 print(f"existing tasks: {task_count}")
@@ -103,7 +103,7 @@ def query_datasource(self, url, sql, expected, iterations):
 Start ingestion task
 ====================""")
 ingestion = druid.post_task(
-    url=f"{protocol}://{druid_cluster_name}-coordinator-default-0.{druid_cluster_name}-coordinator-default-metrics.{namespace}.svc.cluster.local:{coordinator_port}/druid/indexer/v1/task",
+    url=f"{protocol}://{druid_cluster_name}-coordinator-default-0.{druid_cluster_name}-coordinator-default-headless.{namespace}.svc.cluster.local:{coordinator_port}/druid/indexer/v1/task",
     input="/tmp/druid-quickstartimport.json",
 )
 task_id = json.loads(ingestion)["task"]
@@ -113,7 +113,7 @@ def query_datasource(self, url, sql, expected, iterations):
 Re-query tasks
 ==============""")
 tasks = druid.get_tasks(
-    url=f"{protocol}://{druid_cluster_name}-coordinator-default-0.{druid_cluster_name}-coordinator-default-metrics.{namespace}.svc.cluster.local:{coordinator_port}/druid/indexer/v1/tasks",
+    url=f"{protocol}://{druid_cluster_name}-coordinator-default-0.{druid_cluster_name}-coordinator-default-headless.{namespace}.svc.cluster.local:{coordinator_port}/druid/indexer/v1/tasks",
 )
 new_task_count = len(json.loads(tasks))
 print(f"new tasks: {new_task_count}")
@@ -127,7 +127,7 @@ def query_datasource(self, url, sql, expected, iterations):
 while not job_finished:
     time.sleep(5)
     task = druid.get(
-        url=f"{protocol}://{druid_cluster_name}-coordinator-default-0.{druid_cluster_name}-coordinator-default-metrics.{namespace}.svc.cluster.local:{coordinator_port}/druid/indexer/v1/task/{url_encoded_taskid}/status",
+        url=f"{protocol}://{druid_cluster_name}-coordinator-default-0.{druid_cluster_name}-coordinator-default-headless.{namespace}.svc.cluster.local:{coordinator_port}/druid/indexer/v1/task/{url_encoded_taskid}/status",
     )
     task_status = json.loads(task)["status"]["statusCode"]
     print(f"Current task status: [{task_status}]")
@@ -143,7 +143,7 @@ def query_datasource(self, url, sql, expected, iterations):
 while not broker_ready:
     time.sleep(2)
     broker_ready_rc = druid.check_rc(
-        f"{protocol}://{druid_cluster_name}-broker-default-0.{druid_cluster_name}-broker-default-metrics.{namespace}.svc.cluster.local:{broker_port}/druid/broker/v1/readiness"
+        f"{protocol}://{druid_cluster_name}-broker-default-0.{druid_cluster_name}-broker-default-headless.{namespace}.svc.cluster.local:{broker_port}/druid/broker/v1/readiness"
     )
     broker_ready = broker_ready_rc == 200
     print(f"Broker respondend with [{broker_ready_rc}] to readiness check")
@@ -153,7 +153,7 @@ def query_datasource(self, url, sql, expected, iterations):
 ==============""")
 sample_data_size = 39244
 result = druid.query_datasource(
-    url=f"{protocol}://{druid_cluster_name}-broker-default-0.{druid_cluster_name}-broker-default-metrics.{namespace}.svc.cluster.local:{broker_port}/druid/v2/sql",
+    url=f"{protocol}://{druid_cluster_name}-broker-default-0.{druid_cluster_name}-broker-default-headless.{namespace}.svc.cluster.local:{broker_port}/druid/v2/sql",
     sql={"query": 'select count(*) as c from "wikipedia-2015-09-12"'},
     expected=sample_data_size,
     iterations=12,

tests/templates/kuttl/commons/ingestioncheck.py

@@ -55,7 +55,7 @@ def query_datasource(self, url, sql, expected, iterations):
 Query tasks
 ===========""")
 tasks = druid.get_tasks(
-    url=f"https://{druid_cluster_name}-coordinator-default-metrics:8281/druid/indexer/v1/tasks",
+    url=f"https://{druid_cluster_name}-coordinator-default-headless:8281/druid/indexer/v1/tasks",
 )
 task_count = len(json.loads(tasks))
 print(f"existing tasks: {task_count}")
@@ -64,7 +64,7 @@ def query_datasource(self, url, sql, expected, iterations):
 Start ingestion task
 ====================""")
 ingestion = druid.post_task(
-    url=f"https://{druid_cluster_name}-coordinator-default-metrics:8281/druid/indexer/v1/task",
+    url=f"https://{druid_cluster_name}-coordinator-default-headless:8281/druid/indexer/v1/task",
     input="/tmp/druid-quickstartimport.json",
 )
 task_id = json.loads(ingestion)["task"]
@@ -74,7 +74,7 @@ def query_datasource(self, url, sql, expected, iterations):
 Re-query tasks
 ==============""")
 tasks = druid.get_tasks(
-    url=f"https://{druid_cluster_name}-coordinator-default-metrics:8281/druid/indexer/v1/tasks",
+    url=f"https://{druid_cluster_name}-coordinator-default-headless:8281/druid/indexer/v1/tasks",
 )
 new_task_count = len(json.loads(tasks))
 print(f"new tasks: {new_task_count}")
@@ -88,7 +88,7 @@ def query_datasource(self, url, sql, expected, iterations):
 while not job_finished:
     time.sleep(5)
     task = druid.get(
-        url=f"https://{druid_cluster_name}-coordinator-default-metrics:8281/druid/indexer/v1/task/{url_encoded_taskid}/status",
+        url=f"https://{druid_cluster_name}-coordinator-default-headless:8281/druid/indexer/v1/task/{url_encoded_taskid}/status",
     )
     task_status = json.loads(task)["status"]["statusCode"]
     print(f"Current task status: [{task_status}]")
@@ -104,7 +104,7 @@ def query_datasource(self, url, sql, expected, iterations):
 while not broker_ready:
     time.sleep(2)
     broker_ready_rc = druid.check_rc(
-        f"https://{druid_cluster_name}-broker-default-metrics:8282/druid/broker/v1/readiness"
+        f"https://{druid_cluster_name}-broker-default-headless:8282/druid/broker/v1/readiness"
     )
     broker_ready = broker_ready_rc == 200
     print(f"Broker respondend with [{broker_ready_rc}] to readiness check")
@@ -114,7 +114,7 @@ def query_datasource(self, url, sql, expected, iterations):
 ==============""")
 sample_data_size = 39244
 result = druid.query_datasource(
-    url=f"https://{druid_cluster_name}-broker-default-metrics:8282/druid/v2/sql",
+    url=f"https://{druid_cluster_name}-broker-default-headless:8282/druid/v2/sql",
     sql={"query": 'select count(*) as c from "wikipedia-2015-09-12"'},
     expected=sample_data_size,
     iterations=12,

tests/templates/kuttl/ldap/authcheck.py

@@ -26,7 +26,7 @@ def main():
     )
 
     for role, port in druid_role_ports.items():
-        url = f"https://{druid_cluster_name}-{role}-default-metrics:{port}/status"
+        url = f"https://{druid_cluster_name}-{role}-default-headless:{port}/status"
         # make an authorized request -> return 401 expected
         logging.info(f"making unauthorized request to {role}.")
         res = requests.get(url, verify=False)

tests/templates/kuttl/oidc/login.py

@@ -15,7 +15,7 @@
 
 session = requests.Session()
 
-druid_router_service = f"druid-router-default-metrics.{namespace}.svc.cluster.local"
+druid_router_service = f"druid-router-default-headless.{namespace}.svc.cluster.local"
 keycloak_service = f"keycloak.{namespace}.svc.cluster.local"
 
 # Open Druid web UI which will redirect to OIDC login

tests/templates/kuttl/tls/check-tls.sh

@@ -7,7 +7,7 @@ TYPE=$2
 # No encryption
 if [[ $TYPE == "no-tls" ]]
 then
-  HOST=http://derby-druid-router-default-0.derby-druid-router-default-metrics.${NAMESPACE}.svc.cluster.local:8888/status/health
+  HOST=http://derby-druid-router-default-0.derby-druid-router-default-headless.${NAMESPACE}.svc.cluster.local:8888/status/health
 
   # should work
   echo "[NO_TLS] Test unsecured access"
@@ -23,7 +23,7 @@ fi
 # Only encryption
 if [[ $TYPE == "internal-and-server-tls" ]]
 then
-  HOST=https://derby-druid-router-default-0.derby-druid-router-default-metrics.${NAMESPACE}.svc.cluster.local:9088/status/health
+  HOST=https://derby-druid-router-default-0.derby-druid-router-default-headless.${NAMESPACE}.svc.cluster.local:9088/status/health
 
   # should not work without --insecure
   echo "[TLS_ENCRYPTION] Test TLS without trusted CA and without insecure access"
@@ -69,7 +69,7 @@ fi
 # Encryption and TLS client auth
 if [[ $TYPE == "internal-and-server-tls-and-tls-client-auth" ]]
 then
-  HOST=https://derby-druid-router-default-0.derby-druid-router-default-metrics.${NAMESPACE}.svc.cluster.local:9088/status/health
+  HOST=https://derby-druid-router-default-0.derby-druid-router-default-headless.${NAMESPACE}.svc.cluster.local:9088/status/health
 
   # Should fail
   echo "[TLS_AUTH] Test insecure access"