public_git
/
helmfile
mirror of https://github.com/helmfile/helmfile.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: `helmfile template | kubectl apply -f -` should work (#697) 

Fixes #685
This commit is contained in:
KUOKA Yusuke 2019-06-16 16:56:56 +09:00 committed by GitHub
parent 3bf0f7d54e
commit f61334d9bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/helmexec/exec.go
View File

@ -95,7 +95,7 @@ func (helm *execer) UpdateDeps(chart string) error {
func (helm *execer) BuildDeps(chart string) error { func (helm *execer) BuildDeps(chart string) error {
helm.logger.Infof("Building dependency %v", chart) helm.logger.Infof("Building dependency %v", chart)
out, err := helm.exec([]string{"dependency", "build", chart}, map[string]string{}) out, err := helm.exec([]string{"dependency", "build", chart}, map[string]string{})
helm.write(out) helm.info(out)
return err return err
} }
@ -139,7 +139,7 @@ func (helm *execer) DecryptSecret(context HelmContext, name string, flags ...str
preArgs := context.GetTillerlessArgs(helm.helmBinary) preArgs := context.GetTillerlessArgs(helm.helmBinary)
env := context.getTillerlessEnv() env := context.getTillerlessEnv()
out, err := helm.exec(append(append(preArgs, "secrets", "dec", absPath), flags...), env) out, err := helm.exec(append(append(preArgs, "secrets", "dec", absPath), flags...), env)
helm.write(out) helm.info(out)
if err != nil { if err != nil {
return "", err return "", err
} }

3
test/integration/run.sh
View File

@ -93,6 +93,9 @@ ${helm} status --namespace=${test_ns} httpbin &> /dev/null && fail "release shou
info "Ensuring \"helmfile delete\" doesn't fail when no releases installed" info "Ensuring \"helmfile delete\" doesn't fail when no releases installed"
${helmfile} -f ${dir}/happypath.yaml delete || fail "\"helmfile delete\" shouldn't fail when there are no installed releases" ${helmfile} -f ${dir}/happypath.yaml delete || fail "\"helmfile delete\" shouldn't fail when there are no installed releases"
info "Ensuring \"helmfile template\" output does contain only YAML docs"
(${helmfile} -f ${dir}/happypath.yaml template | kubectl apply -f -) || fail "\"helmfile template | kubectl apply -f -\" shouldn't fail"
test_pass "happypath" test_pass "happypath"