openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Merge "Ensure loadBalancerIP is used when defined on the Service"

This commit is contained in:
Zuul 2020-09-03 10:49:45 +00:00 committed by Gerrit Code Review
parent 10db70d998 04c7cb63a4
commit b61f604cb9
1 changed files with 24 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
kuryr_kubernetes/controller/handlers/lbaas.py
View File

@ -140,16 +140,7 @@ class ServiceHandler(k8s_base.ResourceEventHandler):
svc_name = service['metadata']['name'] svc_name = service['metadata']['name']
svc_namespace = service['metadata']['namespace'] svc_namespace = service['metadata']['namespace']
kubernetes = clients.get_kubernetes_client() kubernetes = clients.get_kubernetes_client()
svc_ip = self._get_service_ip(service) spec = self._build_kuryrloadbalancer_spec(service)
spec_lb_ip = service['spec'].get('loadBalancerIP')
ports = service['spec'].get('ports')
for port in ports:
if type(port['targetPort']) == int:
port['targetPort'] = str(port['targetPort'])
project_id = self._drv_project.get_project(service)
sg_ids = self._drv_sg.get_security_groups(service, project_id)
subnet_id = self._get_subnet_id(service, project_id, svc_ip)
spec_type = service['spec'].get('type')
loadbalancer_crd = { loadbalancer_crd = {
'apiVersion': 'openstack.org/v1', 'apiVersion': 'openstack.org/v1',
'kind': 'KuryrLoadBalancer', 'kind': 'KuryrLoadBalancer',
@ -157,21 +148,11 @@ class ServiceHandler(k8s_base.ResourceEventHandler):
'name': svc_name, 'name': svc_name,
'finalizers': [k_const.KURYRLB_FINALIZER], 'finalizers': [k_const.KURYRLB_FINALIZER],
}, },
'spec': { 'spec': spec,
'ip': svc_ip,
'ports': ports,
'project_id': project_id,
'security_groups_ids': sg_ids,
'subnet_id': subnet_id,
'type': spec_type
},
'status': { 'status': {
} }
} }
if spec_lb_ip is not None:
loadbalancer_crd['spec']['lb_ip'] = spec_lb_ip
try: try:
kubernetes.post('{}/{}/kuryrloadbalancers'.format( kubernetes.post('{}/{}/kuryrloadbalancers'.format(
k_const.K8S_API_CRD_NAMESPACES, svc_namespace), k_const.K8S_API_CRD_NAMESPACES, svc_namespace),
@ -186,7 +167,25 @@ class ServiceHandler(k8s_base.ResourceEventHandler):
return loadbalancer_crd return loadbalancer_crd
def _update_crd_spec(self, loadbalancer_crd, service): def _update_crd_spec(self, loadbalancer_crd, service):
svc_name = service['metadata']['name']
kubernetes = clients.get_kubernetes_client()
spec = self._build_kuryrloadbalancer_spec(service)
LOG.debug('Patching KuryrLoadBalancer CRD %s', loadbalancer_crd)
try:
kubernetes.patch_crd('spec', loadbalancer_crd['metadata'][
'selfLink'], spec)
except k_exc.K8sResourceNotFound:
LOG.debug('KuryrLoadBalancer CRD not found %s', loadbalancer_crd)
except k_exc.K8sConflict:
raise k_exc.ResourceNotReady(svc_name)
except k_exc.K8sClientException:
LOG.exception('Error updating kuryrnet CRD %s', loadbalancer_crd)
raise
return loadbalancer_crd
def _build_kuryrloadbalancer_spec(self, service):
svc_ip = self._get_service_ip(service) svc_ip = self._get_service_ip(service)
spec_lb_ip = service['spec'].get('loadBalancerIP')
ports = service['spec'].get('ports') ports = service['spec'].get('ports')
for port in ports: for port in ports:
if type(port['targetPort']) == int: if type(port['targetPort']) == int:
@ -195,31 +194,19 @@ class ServiceHandler(k8s_base.ResourceEventHandler):
sg_ids = self._drv_sg.get_security_groups(service, project_id) sg_ids = self._drv_sg.get_security_groups(service, project_id)
subnet_id = self._get_subnet_id(service, project_id, svc_ip) subnet_id = self._get_subnet_id(service, project_id, svc_ip)
spec_type = service['spec'].get('type') spec_type = service['spec'].get('type')
kubernetes = clients.get_kubernetes_client()
patch = { spec = {
'spec': {
'ip': svc_ip, 'ip': svc_ip,
'ports': ports, 'ports': ports,
'project_id': project_id, 'project_id': project_id,
'security_groups_ids': sg_ids, 'security_groups_ids': sg_ids,
'subnet_id': subnet_id, 'subnet_id': subnet_id,
'type': spec_type 'type': spec_type
}
} }
LOG.debug('Patching KuryrLoadBalancer CRD %s', loadbalancer_crd) if spec_lb_ip is not None:
try: spec['lb_ip'] = spec_lb_ip
kubernetes.patch_crd('spec', loadbalancer_crd['metadata'][ return spec
'selfLink'], patch['spec'])
except k_exc.K8sResourceNotFound:
LOG.debug('KuryrLoadBalancer CRD not found %s', loadbalancer_crd)
except k_exc.K8sConflict:
raise k_exc.ResourceNotReady(loadbalancer_crd)
except k_exc.K8sClientException:
LOG.exception('Error updating kuryrnet CRD %s', loadbalancer_crd)
raise
return loadbalancer_crd
def _has_lbaas_spec_changes(self, service, loadbalancer_crd): def _has_lbaas_spec_changes(self, service, loadbalancer_crd):
return (self._has_ip_changes(service, loadbalancer_crd) or return (self._has_ip_changes(service, loadbalancer_crd) or