openstack/kuryr-kubernetes
Code Issues Proposed changes

Merge "OCP-Router: Update Devref documentation"

Browse Source
This commit is contained in:
Zuul 2018-07-02 15:20:39 +00:00 committed by Gerrit Code Review
commit a01e91c96e
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/source/devref/kuryr_kubernetes_ingress_design.rst
View File

@ -92,14 +92,13 @@ IP (allocated from 'external_svc_subnet').
The following parameters should be configured in kuryr.conf file to
enable L7 Router::
[neutron_defaults]
external_svc_subnet=external_subnet_id
l7_router_ip=<floating_ip> (e.g: 172.24.4.13)
[ingress]
l7_router_uuid=<loadbalancer uuid>
[kubernetes]
enable_ingress = True
# make sure that 'ingresslb' appears in enabled_handlers
enabled_handlers= vif,lb,lbaasspec,ingresslb
In case L7 router is enabled in kuryr.conf, the kuryr-kubernetes controller
should create it only if it doesn't exist.
The L7 Router should notify the Health Manager upon any failure that could
lead to L7 Router's malfunctionality.

2
kuryr_kubernetes/controller/ingress/ingress_ctl.py
View File

@ -116,7 +116,7 @@ class IngressCtrlr(object):
def _is_ingress_controller_disabled(self):
# Note(yboaron) To enable the ingress controller admin should :
# A. Set the L7 router's FIP in kuryr.conf
# A. Set the L7-router/LB UUID in kuryr.conf
# and
# B. Add K8S-ingress and OCP-route handlers to pluggable
# handlers list