From fb9e86c691a80eac20ce48bd2ffe5c3a7582e1cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dulko?= Date: Tue, 11 Aug 2020 14:41:11 +0200 Subject: [PATCH] Ignore update_lbaas_sg() failure on NP deletion I0723d1269e7523d0bb38b3b06ca002aed3bf5653 fixed that for `on_present()`, but apparently it's possible to happen on `on_finalize()` too, so this commit makes sure we ignore ResourceNotFound exception there. Change-Id: I77eabbe53e0224ad4ba37d4cdf9ab3c2c2de1da4 Closes-Bug: 1890421 --- kuryr_kubernetes/controller/handlers/kuryrnetworkpolicy.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kuryr_kubernetes/controller/handlers/kuryrnetworkpolicy.py b/kuryr_kubernetes/controller/handlers/kuryrnetworkpolicy.py index 1e3135e81..da9686183 100644 --- a/kuryr_kubernetes/controller/handlers/kuryrnetworkpolicy.py +++ b/kuryr_kubernetes/controller/handlers/kuryrnetworkpolicy.py @@ -300,7 +300,12 @@ class KuryrNetworkPolicyHandler(k8s_base.ResourceEventHandler): self._is_service_affected(svc, pods_to_update)): continue sgs = self._drv_svc_sg.get_security_groups(svc, project_id) - self._drv_lbaas.update_lbaas_sg(svc, sgs) + try: + self._drv_lbaas.update_lbaas_sg(svc, sgs) + except exceptions.ResourceNotReady: + # We can ignore LB that's being created - its SGs will + # get handled when members will be getting created. + pass self._drv_policy.delete_np_sg(crd_sg)