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

We need check content, when cmd failed.

Browse source 
Signed-off-by: Tang Le <at28997146@163.com>
This commit is contained in:
Tang Le 2017-02-17 19:11:56 +08:00
parent 3d9f89be1d
commit e26efd0b08
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -111,7 +111,13 @@ func (t *Template) Write(conf config.TemplateConfig, isValidTemplate func([]byte
cmd.Stdout = t.outCmdBuf cmd.Stdout = t.outCmdBuf
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
glog.Warningf("unexpected error cleaning template: %v", err) glog.Warningf("unexpected error cleaning template: %v", err)
return t.tmplBuf.Bytes(), nil content := t.tmplBuf.Bytes()
err = isValidTemplate(content)
if err != nil {
return nil, err
}
return content, nil
} }
content := t.outCmdBuf.Bytes() content := t.outCmdBuf.Bytes()