openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Merge "Provide data timeouts for K8s API LB"

This commit is contained in:
Zuul 2018-07-21 16:26:38 +00:00 committed by Gerrit Code Review
parent 9fdbbc3611 719cc1cc28
commit ea4393c3bd
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/lib/kuryr_kubernetes
View File

@ -916,6 +916,7 @@ function create_load_balancer {
# name: Name to give to the load balancer listener.
# protocol: Whether it is HTTP, HTTPS, TCP, etc.
# port: The TCP port number to listen to.
# data_timeouts: Octavia's timeouts for client and server inactivity.
# lb: Id or name of the Load Balancer we want to add the Listener to.
# project_id: Id of the the project where this listener belongs
function create_load_balancer_listener {
@ -923,6 +924,7 @@ function create_load_balancer_listener {
local protocol
local port
local lb
local data_timeouts
local max_timeout
local project_id
@ -931,6 +933,7 @@ function create_load_balancer_listener {
port="$3"
lb="$4"
project_id="$5"
data_timeouts="$6"
max_timeout=1200
# Octavia needs the LB to be active for the listener
@ -940,6 +943,8 @@ function create_load_balancer_listener {
openstack loadbalancer listener create --name "$name" \
--protocol "$protocol" \
--protocol-port "$port" \
--timeout-client-data "$data_timeouts" \
--timeout-member-data "$data_timeouts" \
"$lb"
else
neutron lbaas-listener-create --name "$name" \

2
devstack/plugin.sh
View File

@ -237,7 +237,7 @@ function create_k8s_api_service {
create_load_balancer "$lb_name" "$KURYR_NEUTRON_DEFAULT_SERVICE_SUBNET"\
"$project_id" "$k8s_api_clusterip"
create_load_balancer_listener default/kubernetes:443 HTTPS 443 "$lb_name" "$project_id"
create_load_balancer_listener default/kubernetes:443 HTTPS 443 "$lb_name" "$project_id" 3600000
create_load_balancer_pool default/kubernetes:443 HTTPS ROUND_ROBIN \
default/kubernetes:443 "$project_id" "$lb_name"