openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Merge "Ensure lb sg rules are not updated without namespaces"

This commit is contained in:
Zuul 2018-12-20 18:17:30 +00:00 committed by Gerrit Code Review
parent ad5b5ce51f 3baaccdc03
commit 233de88812
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kuryr_kubernetes/controller/drivers/lbaasv2.py
View File

@ -252,9 +252,12 @@ class LBaaSv2Driver(base.LBaaSDriver):
def _ensure_security_group_rules(self, loadbalancer, listener,
service_type):
namespace_isolation = (
'namespace' in CONF.kubernetes.enabled_handlers and
CONF.kubernetes.service_security_groups_driver == 'namespace')
if loadbalancer.provider == const.NEUTRON_LBAAS_HAPROXY_PROVIDER:
self._ensure_lb_security_group_rule(loadbalancer, listener)
elif service_type == 'ClusterIP':
elif service_type == 'ClusterIP' and namespace_isolation:
self._extend_lb_security_group_rules(loadbalancer, listener)
def ensure_listener(self, loadbalancer, protocol, port,