Merge pull request #281 from medzin/issue-280

Add ability to disable environment substitution in values files

init.go

@@ -60,6 +60,7 @@ func init() {
 	flag.BoolVar(&suppressDiffSecrets, "suppress-diff-secrets", false, "don't show secrets in helm diff output.")
 	flag.IntVar(&diffContext, "diff-context", -1, "number of lines of context to show around changes in helm diff output")
 	flag.BoolVar(&noEnvSubst, "no-env-subst", false, "turn off environment substitution globally")
+	flag.BoolVar(&noEnvValuesSubst, "no-env-values-subst", false, "turn off environment substitution in values files")
 	flag.BoolVar(&updateDeps, "update-deps", false, "run 'helm dep up' for local chart")
 	flag.BoolVar(&forceUpgrades, "force-upgrades", false, "use --force when upgrading helm releases. May cause resources to be recreated.")
 

main.go

@@ -44,6 +44,7 @@ var showDiff bool
 var suppressDiffSecrets bool
 var diffContext int
 var noEnvSubst bool
+var noEnvValuesSubst bool
 var updateDeps bool
 var forceUpgrades bool
 

utils.go

@@ -55,7 +55,7 @@ func fromTOML(file string, s *state) (bool, string) {
 	}
 	addDefaultHelmRepos(s)
 	resolvePaths(file, s)
-	if !noEnvSubst {
+	if !noEnvSubst && !noEnvValuesSubst {
 		substituteEnvInValuesFiles(s)
 	}
 
@@ -107,7 +107,7 @@ func fromYAML(file string, s *state) (bool, string) {
 	addDefaultHelmRepos(s)
 	resolvePaths(file, s)
 
-	if !noEnvSubst {
+	if !noEnvSubst && !noEnvValuesSubst {
 		substituteEnvInValuesFiles(s)
 	}