From 6cd92521ba2ea3597fd9cb89c5a0bb5f805e7b9c Mon Sep 17 00:00:00 2001 From: Adam Medzinski Date: Tue, 13 Aug 2019 10:14:28 +0200 Subject: [PATCH] Add ability to disable environment substitution in values files Resolves #280 --- init.go | 1 + main.go | 1 + utils.go | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/init.go b/init.go index e02268a5..b6d3aa0a 100644 --- a/init.go +++ b/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.") diff --git a/main.go b/main.go index 27b42073..63c3dc6a 100644 --- a/main.go +++ b/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 diff --git a/utils.go b/utils.go index b72da10a..fb89d823 100644 --- a/utils.go +++ b/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) }