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

Fix build error after `helmfile build --embed-values` addition 

This is a follow-up for #1436
This commit is contained in:
Yusuke Kuoka 2020-08-29 15:01:22 +09:00
parent dc6c59dc14
commit cd0ecc5263
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/app/app.go
View File

@ -391,7 +391,7 @@ func (a *App) PrintState(c StateConfigProvider) error {
for i := range run.state.Releases { for i := range run.state.Releases {
r := run.state.Releases[i] r := run.state.Releases[i]
values, err := run.state.LoadYAMLForEmbedding(r.Values, r.MissingFileHandler, r.ValuesPathPrefix) values, err := run.state.LoadYAMLForEmbedding(&r, r.Values, r.MissingFileHandler, r.ValuesPathPrefix)
if err != nil { if err != nil {
errs = []error{err} errs = []error{err}
return return
@ -399,7 +399,7 @@ func (a *App) PrintState(c StateConfigProvider) error {
run.state.Releases[i].Values = values run.state.Releases[i].Values = values
secrets, err := run.state.LoadYAMLForEmbedding(r.Secrets, r.MissingFileHandler, r.ValuesPathPrefix) secrets, err := run.state.LoadYAMLForEmbedding(&r, r.Secrets, r.MissingFileHandler, r.ValuesPathPrefix)
if err != nil { if err != nil {
errs = []error{err} errs = []error{err}
return return

4
pkg/state/state.go
View File

@ -2577,7 +2577,7 @@ func (st *HelmState) ToYaml() (string, error) {
} }
} }
func (st *HelmState) LoadYAMLForEmbedding(entries []interface{}, missingFileHandler *string, pathPrefix string) ([]interface{}, error) { func (st *HelmState) LoadYAMLForEmbedding(release *ReleaseSpec, entries []interface{}, missingFileHandler *string, pathPrefix string) ([]interface{}, error) {
var result []interface{} var result []interface{}
for _, v := range entries { for _, v := range entries {
@ -2598,7 +2598,7 @@ func (st *HelmState) LoadYAMLForEmbedding(entries []interface{}, missingFileHand
} }
yamlOrTemplatePath := paths[0] yamlOrTemplatePath := paths[0]
yamlBytes, err := st.RenderValuesFileToBytes(yamlOrTemplatePath) yamlBytes, err := st.RenderReleaseValuesFileToBytes(release, yamlOrTemplatePath)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to render values files \"%s\": %v", t, err) return nil, fmt.Errorf("failed to render values files \"%s\": %v", t, err)
} }