openstack/kuryr-kubernetes
Code Issues Proposed changes

Ensure SG rule is deleted from CRD upon Namespace deletion

Browse Source 
When a namespace is deleted/updated the corresponding sg rule is
deleted on Neutron but the pointer on the CRD still remains,
which might break the CRD patching during a network policy update.

This commit ensures the sg rule is also removed from the CRD.

Closes-bug: 1872688
Change-Id: I2193f0900b49398b091c5a8f9ba16709e73b1b35
This commit is contained in:
Maysa Macedo 2020-04-14 10:28:55 +00:00
parent faa59b8893
commit c4e47c169d
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kuryr_kubernetes/controller/drivers/network_policy_security_groups.py
View File

@ -396,13 +396,14 @@ def _parse_rules_on_delete_namespace(rule_list, direction, ns_name):
matched = True matched = True
driver_utils.delete_security_group_rule( driver_utils.delete_security_group_rule(
rule['security_group_rule']['id']) rule['security_group_rule']['id'])
for remote_ip, namespace in list(remote_ip_prefixes.items()): elif remote_ip_prefixes:
if namespace == ns_name: for remote_ip, namespace in list(remote_ip_prefixes.items()):
matched = True if namespace == ns_name:
remote_ip_prefixes.pop(remote_ip) matched = True
if remote_ip_prefixes: remote_ip_prefixes.pop(remote_ip)
rule['remote_ip_prefixes'] = remote_ip_prefixes if remote_ip_prefixes:
rules.append(rule) rule['remote_ip_prefixes'] = remote_ip_prefixes
rules.append(rule)
else: else:
rules.append(rule) rules.append(rule)
return matched, rules return matched, rules