From bce2f4728b71a7a173766f11e1018c200e4c602c Mon Sep 17 00:00:00 2001 From: OlivierB Date: Tue, 30 Jul 2019 03:44:42 +0200 Subject: [PATCH] fix: pass namespace to helm template command (#771) Resolves #770 --- pkg/app/app_test.go | 8 ++++---- pkg/state/state.go | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/app/app_test.go b/pkg/app/app_test.go index 1702b7e6..8c6ca93f 100644 --- a/pkg/app/app_test.go +++ b/pkg/app/app_test.go @@ -1906,8 +1906,8 @@ releases: var helm = &mockHelmExec{} var wantReleases = []mockTemplates{ - {[]string{"--name", "myrelease1", "--output-dir", "output/subdir/helmfile-[a-z0-9]{8}-myrelease1"}}, - {[]string{"--name", "myrelease2", "--output-dir", "output/subdir/helmfile-[a-z0-9]{8}-myrelease2"}}, + {[]string{"--name", "myrelease1", "--namespace", "testNamespace", "--output-dir", "output/subdir/helmfile-[a-z0-9]{8}-myrelease1"}}, + {[]string{"--name", "myrelease2", "--namespace", "testNamespace", "--output-dir", "output/subdir/helmfile-[a-z0-9]{8}-myrelease2"}}, } var buffer bytes.Buffer @@ -1920,12 +1920,13 @@ releases: Env: "default", Logger: logger, helmExecer: helm, + Namespace: "testNamespace", }, files) app.Template(configImpl{}) for i := range wantReleases { for j := range wantReleases[i].flags { - if j == 3 { + if j == 5 { matched, _ := regexp.Match(wantReleases[i].flags[j], []byte(helm.templated[i].flags[j])) if !matched { t.Errorf("HelmState.TemplateReleases() = [%v], want %v", helm.templated[i].flags[j], wantReleases[i].flags[j]) @@ -1936,5 +1937,4 @@ releases: } } - } diff --git a/pkg/state/state.go b/pkg/state/state.go index 99818cdd..a6ae762e 100644 --- a/pkg/state/state.go +++ b/pkg/state/state.go @@ -569,6 +569,8 @@ func (st *HelmState) TemplateReleases(helm helmexec.Interface, outputDir string, continue } + st.applyDefaultsTo(&release) + flags, err := st.flagsForTemplate(helm, &release, 0) if err != nil { errs = append(errs, err)