public_git/helmfile
1
0
Fork 0
mirror of https://github.com/helmfile/helmfile.git synced 2026-10-18 18:49:50 +02:00
Code Issues Projects Releases Wiki Activity

Do cleanup decrypted env secrets files (#1304)

Browse Source 
* Do cleanup decrypted env secrets files

Resolves #503
This commit is contained in:
KUOKA Yusuke
2020-06-16 08:59:48 +09:00
committed by GitHub
parent f16d96bc8f
commit 3a2a460fe7
8 changed files with 122 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/state/helmx.go
+16 -8
View File
@@ -22,7 +22,7 @@ func (st *HelmState) appendHelmXFlags(flags []string, release *ReleaseSpec) ([]s
return flags, nil
}
func (st *HelmState) PrepareChartify(helm helmexec.Interface, release *ReleaseSpec, workerIndex int) (bool, *chartify.ChartifyOpts, error) {
func (st *HelmState) PrepareChartify(helm helmexec.Interface, release *ReleaseSpec, workerIndex int) (bool, *chartify.ChartifyOpts, func(), error) {
var opts chartify.ChartifyOpts
opts.WorkaroundOutputDirIssue = true
@@ -66,19 +66,25 @@ func (st *HelmState) PrepareChartify(helm helmexec.Interface, release *ReleaseSp
shouldRun = true
}
var filesNeedCleaning []string
clean := func() {
st.removeFiles(filesNeedCleaning)
}
jsonPatches := release.JSONPatches
if len(jsonPatches) > 0 {
generatedFiles, err := st.generateTemporaryValuesFiles(jsonPatches, release.MissingFileHandler)
if err != nil {
return false, nil, err
return false, nil, clean, err
}
filesNeedCleaning = append(filesNeedCleaning, generatedFiles...)
for _, f := range generatedFiles {
opts.JsonPatches = append(opts.JsonPatches, f)
}
release.generatedValues = append(release.generatedValues, generatedFiles...)
shouldRun = true
}
@@ -86,14 +92,14 @@ func (st *HelmState) PrepareChartify(helm helmexec.Interface, release *ReleaseSp
if len(strategicMergePatches) > 0 {
generatedFiles, err := st.generateTemporaryValuesFiles(strategicMergePatches, release.MissingFileHandler)
if err != nil {
return false, nil, err
return false, nil, clean, err
}
for _, f := range generatedFiles {
opts.StrategicMergePatches = append(opts.StrategicMergePatches, f)
}
release.generatedValues = append(release.generatedValues, generatedFiles...)
filesNeedCleaning = append(filesNeedCleaning, generatedFiles...)
shouldRun = true
}
@@ -101,11 +107,13 @@ func (st *HelmState) PrepareChartify(helm helmexec.Interface, release *ReleaseSp
if shouldRun {
generatedFiles, err := st.generateValuesFiles(helm, release, workerIndex)
if err != nil {
return false, nil, err
return false, nil, clean, err
}
filesNeedCleaning = append(filesNeedCleaning, generatedFiles...)
opts.ValuesFiles = generatedFiles
}
return shouldRun, &opts, nil
return shouldRun, &opts, clean, nil
}