Merge pull request #208 from Sarga/master

Add worker-shutdown-timeout configmap key

Author: pleshakov

examples/customization/README.md

@@ -40,6 +40,7 @@ The table below summarizes some of the options. More options (extensions) are av
 | `nginx.org/listen-ports-ssl` | N/A | Configures HTTPS ports that NGINX will listen on. | `[443]` |
 | N/A | `worker-processes` | Sets the value of the [worker_processes](http://nginx.org/en/docs/ngx_core_module.html#worker_processes) directive. | `auto` |
 | N/A | `worker-cpu-affinity` | Sets the value of the [worker_cpu_affinity](http://nginx.org/en/docs/ngx_core_module.html#worker_cpu_affinity) directive. | N/A |
+| N/A | `worker-shutdown-timeout` | Sets the value of the [worker_shutdown_timeout](http://nginx.org/en/docs/ngx_core_module.html#worker_shutdown_timeout) directive. | N/A |
 | `nginx.org/keepalive` | `keepalive` | Sets the value of the [keepalive](http://nginx.org/en/docs/http/ngx_http_upstream_module.html#keepalive) directive. Note that `proxy_set_header Connection "";` is added to the generated configuration when the value > 0. | `0` |
 
 ## Using ConfigMaps

examples/customization/nginx-config.yaml

@@ -46,4 +46,5 @@ data:
     charset  koi8-r;
   worker-processes: "1" # default is "auto". Sets the value of the worker_processes directive. See http://nginx.org/en/docs/ngx_core_module.html#worker_processes
   worker-cpu-affinity: "auto" # No default. Sets the value of the worker_cpu_affinity directive. See http://nginx.org/en/docs/ngx_core_module.html#worker_cpu_affinity
+  worker-shutdown-timeout: "5m" # No default. Sets the value of the worker_shutdown_timeout directive. See http://nginx.org/en/docs/ngx_core_module.html#worker_shutdown_timeout
   keepalive: "32" # default is 0. When > 0, sets the value of the keepalive directive and adds 'proxy_set_header Connection "";' to a location block. See http://nginx.org/en/docs/http/ngx_http_upstream_module.html#keepalive

nginx-controller/controller/controller.go

@@ -582,6 +582,9 @@ func (lbc *LoadBalancerController) syncCfgm(task Task) {
 		if workerCPUAffinity, exists := cfgm.Data["worker-cpu-affinity"]; exists {
 			cfg.MainWorkerCPUAffinity = workerCPUAffinity
 		}
+		if workerShutdownTimeout, exists := cfgm.Data["worker-shutdown-timeout"]; exists {
+			cfg.MainWorkerShutdownTimeout = workerShutdownTimeout
+		}
 		if keepalive, exists, err := nginx.GetMapKeyAsInt(cfgm.Data, "keepalive", cfgm); exists {
 			if err != nil {
 				glog.Error(err)

nginx-controller/nginx/config.go

@@ -28,6 +28,7 @@ type Config struct {
 	LBMethod                      string
 	MainWorkerProcesses           string
 	MainWorkerCPUAffinity         string
+	MainWorkerShutdownTimeout     string
 	Keepalive                     int64
 
 	// http://nginx.org/en/docs/http/ngx_http_realip_module.html

nginx-controller/nginx/configurator.go

@@ -688,11 +688,12 @@ func (cnf *Configurator) UpdateConfig(config *Config, ingExes []*IngressEx) erro
 		SSLCiphers:                config.MainServerSSLCiphers,
 		SSLDHParam:                config.MainServerSSLDHParam,
 		SSLPreferServerCiphers:    config.MainServerSSLPreferServerCiphers,
-		HTTP2:             config.HTTP2,
-		ServerTokens:      config.ServerTokens,
-		ProxyProtocol:     config.ProxyProtocol,
-		WorkerProcesses:   config.MainWorkerProcesses,
-		WorkerCPUAffinity: config.MainWorkerCPUAffinity,
+		HTTP2:                 config.HTTP2,
+		ServerTokens:          config.ServerTokens,
+		ProxyProtocol:         config.ProxyProtocol,
+		WorkerProcesses:       config.MainWorkerProcesses,
+		WorkerCPUAffinity:     config.MainWorkerCPUAffinity,
+		WorkerShutdownTimeout: config.MainWorkerShutdownTimeout,
 	}
 
 	cnf.nginx.UpdateMainConfigFile(mainCfg)

nginx-controller/nginx/nginx.go

@@ -117,6 +117,7 @@ type NginxMainConfig struct {
 	ProxyProtocol          bool
 	WorkerProcesses        string
 	WorkerCPUAffinity      string
+	WorkerShutdownTimeout  string
 }
 
 // NewUpstreamWithDefaultServer creates an upstream with the default server.

nginx-controller/nginx/templates/nginx-plus.tmpl

@@ -3,6 +3,8 @@ user  nginx;
 worker_processes  {{.WorkerProcesses}};
 {{- if .WorkerCPUAffinity}}
 worker_cpu_affinity {{.WorkerCPUAffinity}};{{end}}
+{{- if .WorkerShutdownTimeout}}
+worker_shutdown_timeout {{.WorkerShutdownTimeout}};{{end}}
 
 daemon off;
 

nginx-controller/nginx/templates/nginx.tmpl

@@ -3,7 +3,8 @@ user  nginx;
 worker_processes  {{.WorkerProcesses}};
 {{- if .WorkerCPUAffinity}}
 worker_cpu_affinity {{.WorkerCPUAffinity}};{{end}}
-
+{{- if .WorkerShutdownTimeout}}
+worker_shutdown_timeout {{.WorkerShutdownTimeout}};{{end}}
 daemon off;
 
 error_log  /var/log/nginx/error.log warn;

nginx-controller/nginx/templates/templates_test.go

@@ -56,6 +56,7 @@ var mainCfg = nginx.NginxMainConfig{
 	ServerTokens:           "off",
 	WorkerProcesses:        "auto",
 	WorkerCPUAffinity:      "auto",
+	WorkerShutdownTimeout:  "1m",
 }
 
 func TestIngressForNGINXPlus(t *testing.T) {