github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #57926 from wwwtyro/rye/bump-load-balancer-timeout 

Automatic merge from submit-queue (batch tested with PRs 57926, 57930). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Add proxy_read_timeout flag to kubeapi_load_balancer charm.

**What this PR does / why we need it**: Add proxy_read_timeout flag to kubeapi_load_balancer charm.

**Release note**:
```release-note
Add proxy_read_timeout flag to kubeapi_load_balancer charm.
```
pull/6/head
Kubernetes Submit Queue 2018-01-08 13:54:31 -08:00 committed by GitHub
parent 8a9954d471 9aa4fc0d3b
commit b22f829643
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/juju/layers/kubeapi-load-balancer/config.yaml
View File

@ -9,3 +9,7 @@ options:
description: | description: |
Space-separated list of extra SAN entries to add to the x509 certificate Space-separated list of extra SAN entries to add to the x509 certificate
created for the load balancers. created for the load balancers.
proxy_read_timeout:
type: int
default: 90
description: Timeout in seconds for reading a response from proxy server.

1
cluster/juju/layers/kubeapi-load-balancer/reactive/load_balancer.py
View File

@ -151,6 +151,7 @@ def install_load_balancer(apiserver, tls):
port=port, port=port,
server_certificate=server_cert_path, server_certificate=server_cert_path,
server_key=server_key_path, server_key=server_key_path,
proxy_read_timeout=hookenv.config('proxy_read_timeout')
) )
maybe_write_apilb_logrotate_config() maybe_write_apilb_logrotate_config()

2
cluster/juju/layers/kubeapi-load-balancer/templates/apilb.conf
View File

@ -36,6 +36,6 @@ server {
add_header X-Stream-Protocol-Version $upstream_http_x_stream_protocol_version; add_header X-Stream-Protocol-Version $upstream_http_x_stream_protocol_version;
proxy_pass https://target_service; proxy_pass https://target_service;
proxy_read_timeout 90; proxy_read_timeout {{ proxy_read_timeout }};
} }
} }