diff --git a/pkg/helmexec/exec.go b/pkg/helmexec/exec.go index 8c482d1e..661ff332 100644 --- a/pkg/helmexec/exec.go +++ b/pkg/helmexec/exec.go @@ -192,7 +192,7 @@ func (helm *execer) DiffRelease(context HelmContext, name, chart string, flags . helm.logger.Infof("Comparing %v %v", name, chart) preArgs := context.GetTillerlessArgs(helm.helmBinary) env := context.getTillerlessEnv() - out, err := helm.exec(append(append(preArgs, "diff", "upgrade", "--allow-unreleased", name, chart), flags...), env) + out, err := helm.exec(append(append(preArgs, "diff", "upgrade", "--reset-values", "--allow-unreleased", name, chart), flags...), env) // Do our best to write STDOUT only when diff existed // Unfortunately, this works only when you run helmfile with `--detailed-exitcode` detailedExitcodeEnabled := false diff --git a/pkg/helmexec/exec_test.go b/pkg/helmexec/exec_test.go index 85e2f0c8..d18c5cfd 100644 --- a/pkg/helmexec/exec_test.go +++ b/pkg/helmexec/exec_test.go @@ -234,8 +234,8 @@ func Test_DiffRelease(t *testing.T) { helm := MockExecer(logger, "dev") helm.DiffRelease(HelmContext{}, "release", "chart", "--timeout 10", "--wait") expected := `Comparing release chart -exec: helm diff upgrade --allow-unreleased release chart --timeout 10 --wait --kube-context dev -exec: helm diff upgrade --allow-unreleased release chart --timeout 10 --wait --kube-context dev: +exec: helm diff upgrade --reset-values --allow-unreleased release chart --timeout 10 --wait --kube-context dev +exec: helm diff upgrade --reset-values --allow-unreleased release chart --timeout 10 --wait --kube-context dev: ` if buffer.String() != expected { t.Errorf("helmexec.DiffRelease()\nactual = %v\nexpect = %v", buffer.String(), expected) @@ -244,8 +244,8 @@ exec: helm diff upgrade --allow-unreleased release chart --timeout 10 --wait --k buffer.Reset() helm.DiffRelease(HelmContext{}, "release", "chart") expected = `Comparing release chart -exec: helm diff upgrade --allow-unreleased release chart --kube-context dev -exec: helm diff upgrade --allow-unreleased release chart --kube-context dev: +exec: helm diff upgrade --reset-values --allow-unreleased release chart --kube-context dev +exec: helm diff upgrade --reset-values --allow-unreleased release chart --kube-context dev: ` if buffer.String() != expected { t.Errorf("helmexec.DiffRelease()\nactual = %v\nexpect = %v", buffer.String(), expected) @@ -258,8 +258,8 @@ func Test_DiffReleaseTillerless(t *testing.T) { helm := MockExecer(logger, "dev") helm.DiffRelease(HelmContext{Tillerless: true}, "release", "chart", "--timeout 10", "--wait") expected := `Comparing release chart -exec: helm tiller run -- helm diff upgrade --allow-unreleased release chart --timeout 10 --wait --kube-context dev -exec: helm tiller run -- helm diff upgrade --allow-unreleased release chart --timeout 10 --wait --kube-context dev: +exec: helm tiller run -- helm diff upgrade --reset-values --allow-unreleased release chart --timeout 10 --wait --kube-context dev +exec: helm tiller run -- helm diff upgrade --reset-values --allow-unreleased release chart --timeout 10 --wait --kube-context dev: ` if buffer.String() != expected { t.Errorf("helmexec.DiffRelease()\nactual = %v\nexpect = %v", buffer.String(), expected)