From 1c4a750867f80d6b32dc26cea3652a5c52afdae4 Mon Sep 17 00:00:00 2001
From: Luis Tomas Bolivar <ltomasbo@redhat.com>
Date: Wed, 30 Sep 2020 17:41:07 +0200
Subject: [PATCH] Ensure only kuryr ports are cleaned up

Change-Id: I6bcf920bd9686c61f8783bcf000b0f12a1568e24
---
 kuryr_kubernetes/controller/drivers/vif_pool.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/kuryr_kubernetes/controller/drivers/vif_pool.py b/kuryr_kubernetes/controller/drivers/vif_pool.py
index 64a9a0621..f60b310a7 100644
--- a/kuryr_kubernetes/controller/drivers/vif_pool.py
+++ b/kuryr_kubernetes/controller/drivers/vif_pool.py
@@ -500,10 +500,22 @@ class BaseVIFPool(base.VIFPoolDriver, metaclass=abc.ABCMeta):
         os_net = clients.get_network_client()
         tags = config.CONF.neutron_defaults.resource_tags
         if tags:
+            subnetpool_id = config.CONF.namespace_subnet.pod_subnet_pool
+            if subnetpool_id:
+                subnets = os_net.subnets(tags=tags,
+                                         subnetpool_id=subnetpool_id)
+                subnets_ids = [s.id for s in subnets]
+            else:
+                subnets_ids = [config.CONF.neutron_defaults.pod_subnet]
+
             # NOTE(ltomasbo): Detached subports gets their device_owner unset
             detached_subports = os_net.ports(
                 device_owner='', status='DOWN', tags=tags)
             for subport in detached_subports:
+                # check if port belonged to kuryr and it was a subport
+                # FIXME(ltomasbo): Assuming single stack
+                if subport.fixed_ips[0]['subnet_id'] not in subnets_ids:
+                    continue
                 try:
                     del self._existing_vifs[subport.id]
                 except KeyError: