From 9aa4fc0d3b2936c78c8c7ea4aa75e751409aff01 Mon Sep 17 00:00:00 2001 From: Rye Terrell Date: Fri, 5 Jan 2018 21:20:31 -0600 Subject: [PATCH] Add proxy_read_timeout flag to kubeapi_load_balancer charm. --- cluster/juju/layers/kubeapi-load-balancer/config.yaml | 4 ++++ .../layers/kubeapi-load-balancer/reactive/load_balancer.py | 1 + .../juju/layers/kubeapi-load-balancer/templates/apilb.conf | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cluster/juju/layers/kubeapi-load-balancer/config.yaml b/cluster/juju/layers/kubeapi-load-balancer/config.yaml index a4678ae02f3..245d7890633 100644 --- a/cluster/juju/layers/kubeapi-load-balancer/config.yaml +++ b/cluster/juju/layers/kubeapi-load-balancer/config.yaml @@ -9,3 +9,7 @@ options: description: | Space-separated list of extra SAN entries to add to the x509 certificate created for the load balancers. + proxy_read_timeout: + type: int + default: 90 + description: Timeout in seconds for reading a response from proxy server. diff --git a/cluster/juju/layers/kubeapi-load-balancer/reactive/load_balancer.py b/cluster/juju/layers/kubeapi-load-balancer/reactive/load_balancer.py index ddb3845a10a..37420c993da 100644 --- a/cluster/juju/layers/kubeapi-load-balancer/reactive/load_balancer.py +++ b/cluster/juju/layers/kubeapi-load-balancer/reactive/load_balancer.py @@ -151,6 +151,7 @@ def install_load_balancer(apiserver, tls): port=port, server_certificate=server_cert_path, server_key=server_key_path, + proxy_read_timeout=hookenv.config('proxy_read_timeout') ) maybe_write_apilb_logrotate_config() diff --git a/cluster/juju/layers/kubeapi-load-balancer/templates/apilb.conf b/cluster/juju/layers/kubeapi-load-balancer/templates/apilb.conf index 6d1b23e25bf..f771b6d9748 100644 --- a/cluster/juju/layers/kubeapi-load-balancer/templates/apilb.conf +++ b/cluster/juju/layers/kubeapi-load-balancer/templates/apilb.conf @@ -36,6 +36,6 @@ server { add_header X-Stream-Protocol-Version $upstream_http_x_stream_protocol_version; proxy_pass https://target_service; - proxy_read_timeout 90; + proxy_read_timeout {{ proxy_read_timeout }}; } }