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

Check content when cmd failed

Browse source 
Signed-off-by: Tang Le <at28997146@163.com>
This commit is contained in:
Tang Le 2017-02-20 10:34:05 +08:00
parent e26efd0b08
commit c0f0cb2ff7
3 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

13
controllers/nginx/pkg/cmd/controller/nginx.go
View file

@ -349,7 +349,7 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) ([]byte, er
}
}
return n.t.Write(config.TemplateConfig{
content, err := n.t.Write(config.TemplateConfig{
ProxySetHeaders: setHeaders,
MaxOpenFiles: maxOpenFiles,
BacklogSize: sysctlSomaxconn(),
@ -361,7 +361,16 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) ([]byte, er
HealthzURI: ngxHealthPath,
CustomErrors: len(cfg.CustomHTTPErrors) > 0,
Cfg: cfg,
}, n.testTemplate)
})
if err != nil {
return nil, err
}
if err := n.testTemplate(content); err != nil {
return nil, err
}
return content, nil
}
// Name returns the healthcheck name