Merge branch 'k8s-job-metadata' into 'master'

k8s: add owner references

Closes #25

See merge request acs/public/villas/controller!23

Author: stv0g

villas/controller/components/managers/kubernetes.py

@@ -38,6 +38,10 @@ def __init__(self, **args):
 
         self.namespace = args.get('namespace', 'default')
 
+        self.my_namespace = os.environ.get('NAMESPACE')
+        self.my_pod_name = os.environ.get('POD_NAME')
+        self.my_pod_uid = os.environ('POD_UID')
+
         self._check_namespace(self.namespace)
 
         # self.pod_watcher_thread.start()

villas/controller/components/simulators/kubernetes.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+from typing import TYPE_CHECKING
 import json
 import signal
 
@@ -7,10 +9,14 @@
 from villas.controller.exceptions import SimulationException
 from villas.controller.util import merge
 
+if TYPE_CHECKING:
+    from villas.controller.components.managers.kubernetes \
+        import KubernetesManager
+
 
 class KubernetesJob(Simulator):
 
-    def __init__(self, manager, **args):
+    def __init__(self, manager: KubernetesManager, **args):
         super().__init__(**args)
 
         self.manager = manager
@@ -40,6 +46,16 @@ def schema(self):
             **super().schema
         }
 
+    def _owner(self):
+        if self.manager.my_pod_name and self.manager.my_pod_uid:
+            return k8s.client.V1OwnerReference(
+                kind='Pod',
+                name=self.manager.my_pod_name,
+                uid=self.manager.my_pod_uid
+            )
+
+        return None
+
     def _prepare_job(self, job, payload):
         # Create config map
         cm = self._create_config_map(payload)
@@ -84,6 +100,9 @@ def _prepare_job(self, job, payload):
         job.metadata.generate_name = name + '-'
         job.metadata.name = None
 
+        if o := self._owner():
+            job.metadata.owner_references = [o]
+
         if job.metadata.labels is None:
             job.metadata.labels = {}
 
@@ -119,6 +138,9 @@ def _create_config_map(self, payload):
             }
         )
 
+        if o := self._owner():
+            self.cm.metadata.owner_references = [o]
+
         return c.create_namespaced_config_map(
             namespace=self.manager.namespace,
             body=self.cm
@@ -147,6 +169,7 @@ def _delete_job(self):
         self.properties['pod_names'] = []
 
     def start(self, payload):
+        # Delete prior job
         self._delete_job()
 
         job = payload.get('job', {})