Merge pull request #772 from Ladicle/fix-init-command

fix(tiller): fix install function
pull/775/merge
Matt Butcher 8 years ago
commit f1b6373f76

@ -40,17 +40,18 @@ func NewInstaller() *Installer {
func (i *Installer) Install(verbose, createNS bool) error { func (i *Installer) Install(verbose, createNS bool) error {
var b bytes.Buffer var b bytes.Buffer
t := template.New("manifest").Funcs(sprig.TxtFuncMap())
// Add namespace // Add namespace
if createNS { if createNS {
if err := template.Must(t.Parse(NamespaceYAML)).Execute(&b, i); err != nil { nstpl := template.New("namespace").Funcs(sprig.TxtFuncMap())
if err := template.Must(nstpl.Parse(NamespaceYAML)).Execute(&b, i); err != nil {
return err return err
} }
} }
// Add main install YAML // Add main install YAML
if err := template.Must(t.Parse(InstallYAML)).Execute(&b, i); err != nil { istpl := template.New("install").Funcs(sprig.TxtFuncMap())
if err := template.Must(istpl.Parse(InstallYAML)).Execute(&b, i); err != nil {
return err return err
} }

Loading…
Cancel
Save