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

fix missingFileHandler (#440) 

- Fix panics when `missingFileHandler` is not defined
- Fix `missingFileHandler: Error` had been writing errors at the Warn level
- Add `Info` and `Debug` as valid values

Ref https://github.com/roboll/helmfile/pull/439#issuecomment-456155521
This commit is contained in:
KUOKA Yusuke 2019-01-22 11:22:53 +09:00 committed by GitHub
parent 171eacfb3c
commit 5f52f96709
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/writing-helmfile.md
View File

@ -72,6 +72,8 @@ templates:
chart: stable/{{`{{ .Release.Name }}`}} chart: stable/{{`{{ .Release.Name }}`}}
namespace: kube-system namespace: kube-system
# This prevents helmfile exiting when it encounters a missing file # This prevents helmfile exiting when it encounters a missing file
# Valid values are "Error", "Warn", "Info", "Debug". The default is "Error"
# Use "Debug" to make missing files errors invisible at the default log level(--log-level=INFO)
missingFileHandler: Warn missingFileHandler: Warn
values: values:
- config/{{`{{ .Release.Name }}`}}/values.yaml - config/{{`{{ .Release.Name }}`}}/values.yaml

20
state/state.go
View File

@ -1104,11 +1104,17 @@ func (st *HelmState) namespaceAndValuesFlags(helm helmexec.Interface, release *R
path := st.normalizePath(release.ValuesPathPrefix + typedValue) path := st.normalizePath(release.ValuesPathPrefix + typedValue)
if _, err := os.Stat(path); os.IsNotExist(err) { if _, err := os.Stat(path); os.IsNotExist(err) {
if release.MissingFileHandler == nil && *release.MissingFileHandler == "Error" { if release.MissingFileHandler == nil || *release.MissingFileHandler == "Error" {
return nil, err return nil, err
} else { } else if *release.MissingFileHandler == "Warn" {
st.logger.Warnf("skipping missing values file \"%s\"", path) st.logger.Warnf("skipping missing values file \"%s\"", path)
continue continue
} else if *release.MissingFileHandler == "Info" {
st.logger.Infof("skipping missing values file \"%s\"", path)
continue
} else {
st.logger.Debugf("skipping missing values file \"%s\"", path)
continue
} }
} }
@ -1148,11 +1154,17 @@ func (st *HelmState) namespaceAndValuesFlags(helm helmexec.Interface, release *R
for _, value := range release.Secrets { for _, value := range release.Secrets {
path := st.normalizePath(release.ValuesPathPrefix + value) path := st.normalizePath(release.ValuesPathPrefix + value)
if _, err := os.Stat(path); os.IsNotExist(err) { if _, err := os.Stat(path); os.IsNotExist(err) {
if release.MissingFileHandler == nil && *release.MissingFileHandler == "Error" { if release.MissingFileHandler == nil || *release.MissingFileHandler == "Error" {
return nil, err return nil, err
} else { } else if *release.MissingFileHandler == "Warn" {
st.logger.Warnf("skipping missing secrets file \"%s\"", path) st.logger.Warnf("skipping missing secrets file \"%s\"", path)
continue continue
} else if *release.MissingFileHandler == "Info" {
st.logger.Infof("skipping missing secrets file \"%s\"", path)
continue
} else {
st.logger.Debugf("skipping missing secrets file \"%s\"", path)
continue
} }
} }