From 38f541604ff490fbc381f78a23655e30e6aa0bcc Mon Sep 17 00:00:00 2001 From: Maysa Macedo Date: Thu, 29 Nov 2018 10:50:07 +0000 Subject: [PATCH] Fix quota readiness check For the policy and vif handlers we didn't treat the case for when neutron resources don't have a limit defined, consequently it was marked as not ready. This patchs fixes the issue by assuring the component is marked as ready when it has no limit. Closes-bug: #1805814 Change-Id: I0a8a7665b01ca6f66c13aa71df0e74adca811d9b --- kuryr_kubernetes/controller/handlers/policy.py | 1 + kuryr_kubernetes/controller/handlers/vif.py | 1 + kuryr_kubernetes/controller/managers/health.py | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/kuryr_kubernetes/controller/handlers/policy.py b/kuryr_kubernetes/controller/handlers/policy.py index 3af77a2b4..a1e5e3279 100644 --- a/kuryr_kubernetes/controller/handlers/policy.py +++ b/kuryr_kubernetes/controller/handlers/policy.py @@ -68,3 +68,4 @@ class NetworkPolicyHandler(k8s_base.ResourceEventHandler): sg_func = neutron.list_security_groups if utils.has_limit(sg_quota): return utils.is_available('security_groups', sg_quota, sg_func) + return True diff --git a/kuryr_kubernetes/controller/handlers/vif.py b/kuryr_kubernetes/controller/handlers/vif.py index 5c18085d6..a69e87f2e 100644 --- a/kuryr_kubernetes/controller/handlers/vif.py +++ b/kuryr_kubernetes/controller/handlers/vif.py @@ -152,6 +152,7 @@ class VIFHandler(k8s_base.ResourceEventHandler): port_func = neutron.list_ports if utils.has_limit(port_quota): return utils.is_available('ports', port_quota, port_func) + return True @staticmethod def _is_host_network(pod): diff --git a/kuryr_kubernetes/controller/managers/health.py b/kuryr_kubernetes/controller/managers/health.py index 1f5ef06d0..276ddf2b8 100644 --- a/kuryr_kubernetes/controller/managers/health.py +++ b/kuryr_kubernetes/controller/managers/health.py @@ -66,7 +66,7 @@ class HealthServer(object): for component in self._registry: if not component.is_ready(quota): - LOG.debug('Controller components are not ready.') + LOG.debug('Controller component not ready: %s.' % component) return False return True