diff --git a/kuryr_kubernetes/controller/handlers/pipeline.py b/kuryr_kubernetes/controller/handlers/pipeline.py index d3507e8e9..3f0cd86d1 100644 --- a/kuryr_kubernetes/controller/handlers/pipeline.py +++ b/kuryr_kubernetes/controller/handlers/pipeline.py @@ -59,4 +59,4 @@ class ControllerPipeline(h_dis.EventPipeline): def _wrap_dispatcher(self, dispatcher): return h_log.LogExceptions(h_async.Async(dispatcher, self._tg, - h_k8s.object_link)) + h_k8s.object_uid)) diff --git a/kuryr_kubernetes/handlers/asynchronous.py b/kuryr_kubernetes/handlers/asynchronous.py old mode 100644 new mode 100755 index 2bfdc0330..599f522e6 --- a/kuryr_kubernetes/handlers/asynchronous.py +++ b/kuryr_kubernetes/handlers/asynchronous.py @@ -99,7 +99,7 @@ class Async(base.EventHandler): self._handler(event) def _done(self, thread, group): - LOG.debug("Asynchronous handler stopped processing %s", group) + LOG.debug("Asynchronous handler stopped processing group %s", group) queue = self._queues.pop(group) if not queue.empty(): diff --git a/kuryr_kubernetes/handlers/k8s_base.py b/kuryr_kubernetes/handlers/k8s_base.py old mode 100644 new mode 100755 index 5c66c897b..9312e1436 --- a/kuryr_kubernetes/handlers/k8s_base.py +++ b/kuryr_kubernetes/handlers/k8s_base.py @@ -24,9 +24,9 @@ def object_kind(event): return None -def object_link(event): +def object_uid(event): try: - return event['object']['metadata']['selfLink'] + return event['object']['metadata']['uid'] except KeyError: return None diff --git a/kuryr_kubernetes/tests/unit/controller/handlers/test_pipeline.py b/kuryr_kubernetes/tests/unit/controller/handlers/test_pipeline.py index e61ae8a4c..69d7c485f 100644 --- a/kuryr_kubernetes/tests/unit/controller/handlers/test_pipeline.py +++ b/kuryr_kubernetes/tests/unit/controller/handlers/test_pipeline.py @@ -57,4 +57,4 @@ class TestControllerPipeline(test_base.TestCase): self.assertEqual(logging_handler, ret) m_logging_type.assert_called_with(async_handler) m_async_type.assert_called_with(dispatcher, thread_group, - h_k8s.object_link) + h_k8s.object_uid)