Merge pull request #2 from saikiran2603/0.0.5

0.0.5

Author: saikiran2603

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="k8s-scheduler",
-    version="0.0.3",
+    version="0.0.5",
     author="Sai Kiran",
     author_email="[email protected]",
     description="Basic Scheduler for k8s",

src/k8s_scheduler/scheduler.py

@@ -125,7 +125,8 @@ def create_k8s_job(self, job_name, container_name, container_image, restart_poli
         try:
             api_response = self.k8s_batch_client.create_namespaced_job(self.k8s_worker_namespace, body, pretty='true')
             print("*********************** Job Created : {} ******************************".format(job_name))
-            # print(api_response)
+            print(api_response.metadata.uid)
+            return api_response.metadata.uid
             # job_resp = self.k8s_batch_client.read_namespaced_job(name=job_name, namespace=self.k8s_worker_namespace)
             # print(job_resp)
         except ApiException as e:
@@ -154,7 +155,8 @@ def create_k8s_pod(self, pod_name, container_name, container_image, restart_poli
         try:
             api_response = self.k8s_client.create_namespaced_pod(self.k8s_worker_namespace, pod_manifest, pretty='true')
             print("*********************** Pod Created : {} ******************************".format(pod_name))
-            # print(api_response)
+            print(api_response.metadata.uid)
+            return api_response.metadata.uid
             # pod_resp = self.k8s_client.read_namespaced_pod(name=pod_name, namespace=self.k8s_worker_namespace)
             # print(pod_resp)
         except ApiException as e:
@@ -238,8 +240,9 @@ def check_periodic_schedules(self, schedule_rec, result_db_collection):
             if k8s_rec['restart_policy'] != "":
                 create_job_args['restart_policy'] = k8s_rec['restart_policy']
 
-            self.create_k8s_job(**create_job_args)
+            uid = self.create_k8s_job(**create_job_args)
             self.result_backend.insert_result_record(result_db_collection, {"schedule_name": k8s_rec['name'],
+                                                                            "kubernetes_job_id": uid,
                                                                             "schedule_date": datetime.now()})
 
     def check_stream_jobs(self, schedule_rec, result_db_collection):
@@ -280,8 +283,9 @@ def check_stream_jobs(self, schedule_rec, result_db_collection):
             if k8s_rec['restart_policy'] != "":
                 launch_pod_args['restart_policy'] = k8s_rec['restart_policy']
 
-            self.create_k8s_pod(**launch_pod_args)
+            uid = self.create_k8s_pod(**launch_pod_args)
             self.result_backend.insert_result_record(result_db_collection, {"schedule_name": k8s_rec['name'],
+                                                                            "kubernetes_job_id": uid,
                                                                             "schedule_date": datetime.now()})
 
             # check if service needs to be launched.

testing/test_scheduler.py

@@ -3,7 +3,7 @@
 
 scheduler = Scheduler(host="test-mongodb-0.test-mongodb-headless.test-mongodb.svc.cluster.local:27017,test-mongodb-1.test-mongodb-headless.test-mongodb.svc.cluster.local:27017",
                       username="root",
-                      password="LF0t9E3KOv",
+                      password="SU2vpCJnJd",
                       db_name="test_schedule")
 
 log_handler = LogHandler(elastic_search_server='10.1.179.109',