From 2bb16e6fc5b108c7cb96711316154619e43bebc6 Mon Sep 17 00:00:00 2001 From: rawlingsj Date: Mon, 25 Jul 2016 16:59:04 +0100 Subject: [PATCH] set a default server_names_hash_bucket_size so that controller logic applies ConfigMap overrides fixes nginxinc/kubernetes-ingress#34 --- nginx-controller/nginx/config.go | 1 + nginx-controller/nginx/nginx.go | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/nginx-controller/nginx/config.go b/nginx-controller/nginx/config.go index 3db5bdc958..aa26c3a5bf 100644 --- a/nginx-controller/nginx/config.go +++ b/nginx-controller/nginx/config.go @@ -16,5 +16,6 @@ func NewDefaultConfig() *Config { ProxyReadTimeout: "60s", ClientMaxBodySize: "1m", MainServerNamesHashMaxSize: "512", + MainServerNamesHashBucketSize: "32", } } diff --git a/nginx-controller/nginx/nginx.go b/nginx-controller/nginx/nginx.go index d6063a478e..90c7d1f809 100644 --- a/nginx-controller/nginx/nginx.go +++ b/nginx-controller/nginx/nginx.go @@ -81,7 +81,11 @@ func NewNginxController(nginxConfPath string, local bool) (*NginxController, err ngxc.createCertsDir() } - cfg := &NginxMainConfig{ServerNamesHashMaxSize: NewDefaultConfig().MainServerNamesHashMaxSize} + cfg := &NginxMainConfig{ + ServerNamesHashMaxSize: NewDefaultConfig().MainServerNamesHashMaxSize, + ServerNamesHashBucketSize: NewDefaultConfig().MainServerNamesHashBucketSize, + } + ngxc.UpdateMainConfigFile(cfg) return &ngxc, nil