C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make haproxy/nginx client timeout configurable (#5140)

Browse source 
Change-Id: I61319a06eb33d9fc868e19941924f387088b856b
This commit is contained in:
Matthew Mosesohn 2019-09-05 10:32:51 +03:00 committed by Kubernetes Prow Robot
parent 56523812d3
commit 7f74906d33
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/kubernetes/node/defaults/main.yml
View file

@ -46,6 +46,8 @@ kubelet_status_update_frequency: 10s
loadbalancer_apiserver_memory_requests: 32M loadbalancer_apiserver_memory_requests: 32M
loadbalancer_apiserver_cpu_requests: 25m loadbalancer_apiserver_cpu_requests: 25m
loadbalancer_apiserver_keepalive_timeout: 5m
# kube_api_runtime_config: # kube_api_runtime_config:
# - extensions/v1beta1/daemonsets=true # - extensions/v1beta1/daemonsets=true
# - extensions/v1beta1/deployments=true # - extensions/v1beta1/deployments=true

2
roles/kubernetes/node/templates/loadbalancer/haproxy.cfg.j2
View file

@ -13,7 +13,7 @@ defaults
timeout http-request 5m timeout http-request 5m
timeout queue 5m timeout queue 5m
timeout connect 30s timeout connect 30s
timeout client 15m timeout client {{ loadbalancer_apiserver_keepalive_timeout }}
timeout server 15m timeout server 15m
timeout http-keep-alive 30s timeout http-keep-alive 30s
timeout check 30s timeout check 30s

2
roles/kubernetes/node/templates/loadbalancer/nginx.conf.j2
View file

@ -32,7 +32,7 @@ http {
tcp_nopush on; tcp_nopush on;
tcp_nodelay on; tcp_nodelay on;
keepalive_timeout 75s; keepalive_timeout {{ loadbalancer_apiserver_keepalive_timeout }};
keepalive_requests 100; keepalive_requests 100;
reset_timedout_connection on; reset_timedout_connection on;
server_tokens off; server_tokens off;