openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Skip unscheduled pods when deleting NPs 

It may happen that there's an unscheduled pod matching a policy when NP
is getting deleted. In that case we'll get a traceback as pod has no
nodeName set. This commit fixes that by making sure we skip unscheduled
pods when detaching SGs from ports on NP deletion.

Change-Id: I5b712ba97e030192d1d24cce2585724a78408e23
Closes-Bug: 1904040
This commit is contained in:
Michał Dulko 2020-11-13 11:20:57 +01:00
parent bef15d1bbe
commit dce5939c24
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kuryr_kubernetes/controller/drivers/utils.py
View File

@ -83,6 +83,13 @@ def is_host_network(pod):
return pod['spec'].get('hostNetwork', False)
def is_pod_scheduled(pod):
try:
return bool(pod['spec']['nodeName'])
except KeyError:
return False
def get_pods(selector, namespace=None):
"""Return a k8s object list with the pods matching the selector.

3
kuryr_kubernetes/controller/handlers/kuryrnetworkpolicy.py
View File

@ -273,7 +273,8 @@ class KuryrNetworkPolicyHandler(k8s_base.ResourceEventHandler):
if crd_sg:
for pod in pods_to_update:
if driver_utils.is_host_network(pod):
if (driver_utils.is_host_network(pod)
or not driver_utils.is_pod_scheduled(pod)):
continue
pod_sgs = self._drv_pod_sg.get_security_groups(pod, project_id)
if crd_sg in pod_sgs: