openstack/kuryr-kubernetes
Code Issues Proposed changes

Revert "Ensure namespace network resources are deleted even on subnet not found"

Browse Source 
This reverts commit 7691e94ef3. The 0.41.0
version of openstacksdk is free of this issue. Also we still need to
keep the handle_neutron_errors for support of older openstacksdks.

Change-Id: I5bffda72cc8f1e348581ef38cb68cb8336e2af59
This commit is contained in:
Michał Dulko 2020-02-06 10:09:48 +01:00
parent b0779c76e1
commit 6d46466c27
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kuryr_kubernetes/controller/drivers/namespace_subnet.py
View File

@ -102,17 +102,11 @@ class NamespacePodSubnetDriver(default_subnet.DefaultPodSubnetDriver):
# or subnet is already detached. # or subnet is already detached.
LOG.debug(e.message) LOG.debug(e.message)
pass pass
except os_exc.SDKException as e: except os_exc.SDKException:
# FIXME(maysams): Rely only on the NotFoundException handling LOG.exception("Error deleting subnet %(subnet)s from router "
# when the bug fixed at 704998 is merged. "%(router)s.",
if "could not be found" in str(e.message): {'subnet': subnet_id, 'router': router_id})
LOG.debug(e.message) raise
else:
LOG.exception(
"Error deleting subnet %(subnet)s from router "
"%(router)s.", {'subnet': subnet_id, 'router':
router_id})
raise
try: try:
os_net.delete_network(net_id) os_net.delete_network(net_id)