Check if cgroup cpu limits are defined to get the number of CPUs

This commit is contained in:
Manuel de Brito Fontes 2018-08-25 18:08:12 -03:00 committed by Manuel Alejandro de Brito Fontes
parent 5e584ab693
commit 16fce7444f
No known key found for this signature in database
GPG key ID: 786136016A8BA02A
3 changed files with 77 additions and 1 deletions

View file

@ -31,6 +31,7 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/ingress-nginx/internal/ingress/controller/config"
ing_net "k8s.io/ingress-nginx/internal/net"
"k8s.io/ingress-nginx/internal/runtime"
)
const (
@ -45,6 +46,7 @@ const (
nginxStatusIpv4Whitelist = "nginx-status-ipv4-whitelist"
nginxStatusIpv6Whitelist = "nginx-status-ipv6-whitelist"
proxyHeaderTimeout = "proxy-protocol-header-timeout"
workerProcesses = "worker-processes"
)
var (
@ -166,6 +168,16 @@ func ReadConfig(src map[string]string) config.Configuration {
delete(conf, nginxStatusIpv6Whitelist)
}
if val, ok := conf[workerProcesses]; ok {
to.WorkerProcesses = val
if val == "auto" {
to.WorkerProcesses = strconv.Itoa(runtime.NumCPU())
}
delete(conf, workerProcesses)
}
to.CustomHTTPErrors = filterErrors(errors)
to.SkipAccessLogURLs = skipUrls
to.WhitelistSourceRange = whiteList