Remove "elasticdl-" prefix to ps/worker pod name (#2489)

* remove prefix to ps/worker pod name

* fix tests

* fix black

Author: skydoorkai

elasticdl/python/common/k8s_client.py

@@ -31,11 +31,11 @@
 
 
 def get_worker_pod_name(job_name, worker_id):
-    return "elasticdl-%s-worker-%s" % (job_name, str(worker_id))
+    return "%s-worker-%s" % (job_name, str(worker_id))
 
 
 def get_ps_pod_name(job_name, ps_id):
-    return "elasticdl-%s-ps-%s" % (job_name, str(ps_id))
+    return "%s-ps-%s" % (job_name, str(ps_id))
 
 
 class Client(BaseClient):

elasticdl/python/tests/pod_manager_test.py

@@ -316,11 +316,11 @@ def test_get_tf_config_data(self):
 
         tf_config_cluster = '{"cluster": \
             {"ps": \
-              ["elasticdl-JOBNAME-ps-0.NAMESPACE.svc:PSPORT", \
-               "elasticdl-JOBNAME-ps-1.NAMESPACE.svc:PSPORT"], \
+              ["JOBNAME-ps-0.NAMESPACE.svc:PSPORT", \
+               "JOBNAME-ps-1.NAMESPACE.svc:PSPORT"], \
              "worker": \
-              ["elasticdl-JOBNAME-worker-0.NAMESPACE.svc:WORKERPORT", \
-               "elasticdl-JOBNAME-worker-1.NAMESPACE.svc:WORKERPORT"] \
+              ["JOBNAME-worker-0.NAMESPACE.svc:WORKERPORT", \
+               "JOBNAME-worker-1.NAMESPACE.svc:WORKERPORT"] \
             }}'
         tf_config_cluster = tf_config_cluster.replace("JOBNAME", job_name)
         tf_config_cluster = tf_config_cluster.replace("NAMESPACE", namespace)

scripts/validate_job_status.py

@@ -89,11 +89,10 @@ def check_failed(statuses):
 
 def validate_job_status(client, job_type, ps_num, worker_num):
     ps_pod_names = [
-        "elasticdl-test-" + job_type + "-ps-" + str(i) for i in range(ps_num)
+        "test-" + job_type + "-ps-" + str(i) for i in range(ps_num)
     ]
     worker_pod_names = [
-        "elasticdl-test-" + job_type + "-worker-" + str(i)
-        for i in range(worker_num)
+        "test-" + job_type + "-worker-" + str(i) for i in range(worker_num)
     ]
     master_pod_name = "elasticdl-test-" + job_type + "-master"