From 4bc46c022a98e14a76bfdb1938c07a9d5d3f2446 Mon Sep 17 00:00:00 2001 From: Anish Ramasekar Date: Mon, 29 Jan 2018 22:05:38 -0600 Subject: [PATCH] Add documentation --- docs/user-guide/configmap.md | 7 ++++++- internal/ingress/controller/config/config.go | 4 ++-- rootfs/etc/nginx/template/nginx.tmpl | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/docs/user-guide/configmap.md b/docs/user-guide/configmap.md index 3ac1caead..d4d03acb3 100644 --- a/docs/user-guide/configmap.md +++ b/docs/user-guide/configmap.md @@ -127,6 +127,7 @@ The following table shows a configuration option's name, type, and the default v |[limit‑rate‑after](#limit-rate-after)|int|0| |[http‑redirect‑code](#http-redirect-code)|int|308| |[proxy‑buffering](#proxy-buffering)|string|"off"| +|[limit‑request‑status‑code](#limit-request-status-code)|int|503| ## add-headers @@ -702,4 +703,8 @@ Why the default code is 308? ## proxy-buffering -Enables or disables [buffering of responses from the proxied server](http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_buffering). \ No newline at end of file +Enables or disables [buffering of responses from the proxied server](http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_buffering). + +## limit-request-status-code + +Sets the [status code to return in response to rejected requests](http://nginx.org/en/docs/http/ngx_http_limit_req_module.html#limit_req_status).Default: 503 \ No newline at end of file diff --git a/internal/ingress/controller/config/config.go b/internal/ingress/controller/config/config.go index 8808c0f2b..0128f0e69 100644 --- a/internal/ingress/controller/config/config.go +++ b/internal/ingress/controller/config/config.go @@ -471,7 +471,7 @@ type Configuration struct { // LargeClientHeaderBuffers Sets the status code to return in response to rejected requests. // http://nginx.org/en/docs/http/ngx_http_limit_req_module.html#limit_req_status // Default: 503 - LimitReqStatus string `json:"limit-req-status"` + LimitReqStatusCode int `json:"limit-req-status-code"` } // NewDefault returns the default nginx configuration @@ -565,7 +565,7 @@ func NewDefault() Configuration { JaegerServiceName: "nginx", JaegerSamplerType: "const", JaegerSamplerParam: "1", - LimitReqStatus: "503", + LimitReqStatusCode: 503, } if glog.V(5) { diff --git a/rootfs/etc/nginx/template/nginx.tmpl b/rootfs/etc/nginx/template/nginx.tmpl index 4040f5507..3e88ed0f4 100644 --- a/rootfs/etc/nginx/template/nginx.tmpl +++ b/rootfs/etc/nginx/template/nginx.tmpl @@ -102,7 +102,7 @@ http { underscores_in_headers {{ if $cfg.EnableUnderscoresInHeaders }}on{{ else }}off{{ end }}; ignore_invalid_headers {{ if $cfg.IgnoreInvalidHeaders }}on{{ else }}off{{ end }}; - limit_req_status {{ $cfg.LimitReqStatus }}; + limit_req_status {{ $cfg.LimitReqStatusCode }}; {{ if $cfg.EnableOpentracing }} opentracing on;