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

Auto stash before merge of "master" and "master/master"

Browse source 
Remove go-reap and use tini as process reaper
This commit is contained in:
Manuel de Brito Fontes 2017-05-16 16:06:33 -04:00
parent 8ca5fbeece
commit 22d63d0ad0
4 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
controllers/nginx/pkg/template/template.go
View file

@ -40,7 +40,6 @@ import (
const (
slash = "/"
defBufferSize = 65535
errNoChild = "wait: no child processes"
)
// Template ...
@ -102,7 +101,7 @@ func (t *Template) Write(conf config.TemplateConfig) ([]byte, error) {
}
err := t.tmpl.Execute(t.tmplBuf, conf)
if err != nil && err.Error() != errNoChild {
if err != nil {
return nil, err
}
@ -112,10 +111,7 @@ func (t *Template) Write(conf config.TemplateConfig) ([]byte, error) {
cmd.Stdin = t.tmplBuf
cmd.Stdout = t.outCmdBuf
if err := cmd.Run(); err != nil {
if err.Error() != errNoChild {
glog.Warningf("unexpected error cleaning template: %v", err)
}
glog.Warningf("unexpected error cleaning template: %v", err)
return t.tmplBuf.Bytes(), nil
}