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. ```

Merge pull request #57926 from wwwtyro/rye/bump-load-balancer-timeout
b22f8296 · Kubernetes Submit Queue · GitHub · 8a9954d4 · 9aa4fc0d · b22f8296
Unverified Commit b22f8296 authored Jan 08, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 08, 2018
3 changed files
--- 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.
--- 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()

--- 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 }};
    }
 }