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

Merge pull request #141 from mumoshu/always-reset-values 

Force `--reset-values` on sync
This commit is contained in:
KUOKA Yusuke 2018-05-11 03:05:45 +09:00 committed by GitHub
parent 26ffdc2f24 c41dbc4c9f
commit 568d750f75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helmexec/exec.go
View File

@ -54,7 +54,7 @@ func (helm *execer) UpdateDeps(chart string) error {
} }
func (helm *execer) SyncRelease(name, chart string, flags ...string) error { func (helm *execer) SyncRelease(name, chart string, flags ...string) error {
out, err := helm.exec(append([]string{"upgrade", "--install", name, chart}, flags...)...) out, err := helm.exec(append([]string{"upgrade", "--install", "--reset-values", name, chart}, flags...)...)
helm.write(out) helm.write(out)
return err return err
} }

6
helmexec/exec_test.go
View File

@ -87,16 +87,16 @@ func Test_SyncRelease(t *testing.T) {
var buffer bytes.Buffer var buffer bytes.Buffer
helm := MockExecer(&buffer, "dev") helm := MockExecer(&buffer, "dev")
helm.SyncRelease("release", "chart", "--timeout 10", "--wait") helm.SyncRelease("release", "chart", "--timeout 10", "--wait")
expected := "exec: helm upgrade --install release chart --timeout 10 --wait --kube-context dev\n" expected := "exec: helm upgrade --install --reset-values release chart --timeout 10 --wait --kube-context dev\n"
if buffer.String() != expected { if buffer.String() != expected {
t.Errorf("helmexec.SyncRelease()\nactual = %v\nexpect = %v", buffer.String(), expected) t.Errorf("helmexec.SyncRelease()\nactual = %v\nexpect = %v", buffer.String(), expected)
} }
buffer.Reset() buffer.Reset()
helm.SyncRelease("release", "chart") helm.SyncRelease("release", "chart")
expected = "exec: helm upgrade --install release chart --kube-context dev\n" expected = "exec: helm upgrade --install --reset-values release chart --kube-context dev\n"
if buffer.String() != expected { if buffer.String() != expected {
t.Errorf("helmexec.AddRepo()\nactual = %v\nexpect = %v", buffer.String(), expected) t.Errorf("helmexec.SyncRelease()\nactual = %v\nexpect = %v", buffer.String(), expected)
} }
} }