DevFW-CICD/ingress-nginx-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #725 from bai/keepalice-and-body-buffer-config

Browse source 
Add keepalive_requests and client_body_buffer_size options
This commit is contained in:
Manuel Alejandro de Brito Fontes 2017-05-17 07:31:50 -04:00 committed by GitHub
commit 5b37a677de
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
controllers/nginx/pkg/config/config.go
View file

@ -92,6 +92,10 @@ type Configuration struct {
// http://nginx.org/en/docs/http/ngx_http_core_module.html#client_header_buffer_size // http://nginx.org/en/docs/http/ngx_http_core_module.html#client_header_buffer_size
ClientHeaderBufferSize string `json:"client-header-buffer-size"` ClientHeaderBufferSize string `json:"client-header-buffer-size"`
// Sets buffer size for reading client request body
// http://nginx.org/en/docs/http/ngx_http_core_module.html#client_body_buffer_size
ClientBodyBufferSize string `json:"client-body-buffer-size,omitempty"`
// DisableAccessLog disables the Access Log globally from NGINX ingress controller // DisableAccessLog disables the Access Log globally from NGINX ingress controller
//http://nginx.org/en/docs/http/ngx_http_log_module.html //http://nginx.org/en/docs/http/ngx_http_log_module.html
DisableAccessLog bool `json:"disable-access-log,omitempty"` DisableAccessLog bool `json:"disable-access-log,omitempty"`
@ -155,6 +159,10 @@ type Configuration struct {
// http://nginx.org/en/docs/http/ngx_http_core_module.html#keepalive_timeout // http://nginx.org/en/docs/http/ngx_http_core_module.html#keepalive_timeout
KeepAlive int `json:"keep-alive,omitempty"` KeepAlive int `json:"keep-alive,omitempty"`
// Sets the maximum number of requests that can be served through one keep-alive connection.
// http://nginx.org/en/docs/http/ngx_http_core_module.html#keepalive_requests
KeepAliveRequests int `json:"keep-alive-requests,omitempty"`
// LargeClientHeaderBuffers Sets the maximum number and size of buffers used for reading // LargeClientHeaderBuffers Sets the maximum number and size of buffers used for reading
// large client request header. // large client request header.
// http://nginx.org/en/docs/http/ngx_http_core_module.html#large_client_header_buffers // http://nginx.org/en/docs/http/ngx_http_core_module.html#large_client_header_buffers
@ -273,6 +281,7 @@ type Configuration struct {
func NewDefault() Configuration { func NewDefault() Configuration {
cfg := Configuration{ cfg := Configuration{
ClientHeaderBufferSize: "1k", ClientHeaderBufferSize: "1k",
ClientBodyBufferSize: "8k",
EnableDynamicTLSRecords: true, EnableDynamicTLSRecords: true,
EnableUnderscoresInHeaders: false, EnableUnderscoresInHeaders: false,
ErrorLogLevel: errorLevel, ErrorLogLevel: errorLevel,
@ -285,6 +294,7 @@ func NewDefault() Configuration {
IgnoreInvalidHeaders: true, IgnoreInvalidHeaders: true,
GzipTypes: gzipTypes, GzipTypes: gzipTypes,
KeepAlive: 75, KeepAlive: 75,
KeepAliveRequests: 100,
LargeClientHeaderBuffers: "4 8k", LargeClientHeaderBuffers: "4 8k",
LogFormatStream: logFormatStream, LogFormatStream: logFormatStream,
LogFormatUpstream: logFormatUpstream, LogFormatUpstream: logFormatUpstream,

2
controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl
View file

@ -57,9 +57,11 @@ http {
reset_timedout_connection on; reset_timedout_connection on;
keepalive_timeout {{ $cfg.KeepAlive }}s; keepalive_timeout {{ $cfg.KeepAlive }}s;
keepalive_requests {{ $cfg.KeepAliveRequests }};
client_header_buffer_size {{ $cfg.ClientHeaderBufferSize }}; client_header_buffer_size {{ $cfg.ClientHeaderBufferSize }};
large_client_header_buffers {{ $cfg.LargeClientHeaderBuffers }}; large_client_header_buffers {{ $cfg.LargeClientHeaderBuffers }};
client_body_buffer_size {{ $cfg.ClientBodyBufferSize }};
http2_max_field_size {{ $cfg.HTTP2MaxFieldSize }}; http2_max_field_size {{ $cfg.HTTP2MaxFieldSize }};
http2_max_header_size {{ $cfg.HTTP2MaxHeaderSize }}; http2_max_header_size {{ $cfg.HTTP2MaxHeaderSize }};