Add limit-request-status-code option (#2001)

* Add support for limit_req_status * Add documentation * Fix comment
kubernetes · Jan 30, 2018 · 2f700a9 · 2f700a9
1 parent 951a704
commit 2f700a9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git 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&#8209;rate&#8209;after](#limit-rate-after)|int|0|
 |[http&#8209;redirect&#8209;code](#http-redirect-code)|int|308|
 |[proxy&#8209;buffering](#proxy-buffering)|string|"off"|
+|[limit&#8209;request&#8209;status&#8209;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).
+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
diff --git a/internal/ingress/controller/config/config.go b/internal/ingress/controller/config/config.go
@@ -467,6 +467,11 @@ type Configuration struct {
 	// server to the client response
 	// Default: empty
 	HideHeaders []string `json:"hide-headers"`
+
+	// LimitReqStatusCode 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
+	LimitReqStatusCode int `json:"limit-req-status-code"`
 }
 
 // NewDefault returns the default nginx configuration
@@ -560,6 +565,7 @@ func NewDefault() Configuration {
 		JaegerServiceName:            "nginx",
 		JaegerSamplerType:            "const",
 		JaegerSamplerParam:           "1",
+		LimitReqStatusCode:           503,
 	}
 
 	if glog.V(5) {

diff --git a/rootfs/etc/nginx/template/nginx.tmpl b/rootfs/etc/nginx/template/nginx.tmpl
@@ -102,6 +102,8 @@ 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.LimitReqStatusCode }};
+
     {{ if $cfg.EnableOpentracing }}
     opentracing on;
     {{ end }}