Merge pull request #411 from MaysaMacedo/fix-retrival-of-lb

Bug 1896696: Ensure leftover loadbalancer is cleaned up

kuryr_kubernetes/controller/drivers/lbaasv2.py

@@ -778,6 +778,17 @@ def _post_lb_resource(self, resource, request, **kwargs):
         response_dict = response.json()[resource.resource_key]
         return resource(**response_dict)
 
+    def get_loadbalancers(self, request):
+        lbaas = clients.get_loadbalancer_client()
+        resource = o_lb.LoadBalancer
+        response = lbaas.get(resource.base_path, params=request)
+        if not response.ok:
+            LOG.error('Error when retrieving %s: %s', resource.resources_key,
+                      response.text)
+            response.raise_for_status()
+        response = response.json()[resource.resources_key]
+        return response
+
     def _create_loadbalancer(self, loadbalancer):
         request = {
             'name': loadbalancer.name,

kuryr_kubernetes/controller/handlers/lbaas.py

@@ -633,7 +633,6 @@ def _sync_lbaas_loadbalancer(self, endpoints, lbaas_state, lbaas_spec):
         return changed
 
     def _cleanup_leftover_lbaas(self):
-        lbaas_client = clients.get_loadbalancer_client()
         services = []
         try:
             services = driver_utils.get_services().get('items')
@@ -646,11 +645,11 @@ def _cleanup_leftover_lbaas(self):
                                   if service['spec'].get('clusterIP'))
         lbaas_spec = {}
         self._drv_lbaas.add_tags('loadbalancer', lbaas_spec)
-        loadbalancers = lbaas_client.load_balancers(**lbaas_spec)
+        loadbalancers = self._drv_lbaas.get_loadbalancers(lbaas_spec)
         for loadbalancer in loadbalancers:
+            loadbalancer = obj_lbaas.LBaaSLoadBalancer(**loadbalancer)
             if loadbalancer.vip_address not in services_cluster_ip:
-                lb_obj = obj_lbaas.LBaaSLoadBalancer(**loadbalancer)
-                eventlet.spawn(self._ensure_release_lbaas, lb_obj)
+                eventlet.spawn(self._ensure_release_lbaas, loadbalancer)
 
     def _ensure_release_lbaas(self, lb_obj):
         attempts = 0