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

This is a follow-up for #1436
roboll · Aug 29, 2020 · cd0ecc5 · cd0ecc5
1 parent dc6c59d
commit cd0ecc5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/app/app.go b/pkg/app/app.go
@@ -391,15 +391,15 @@ func (a *App) PrintState(c StateConfigProvider) error {
 				for i := range run.state.Releases {
 					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 {
 						errs = []error{err}
 						return
 					}
 
 					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 {
 						errs = []error{err}
 						return

diff --git a/pkg/state/state.go b/pkg/state/state.go
@@ -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{}
 
 	for _, v := range entries {
@@ -2598,7 +2598,7 @@ func (st *HelmState) LoadYAMLForEmbedding(entries []interface{}, missingFileHand
 			}
 			yamlOrTemplatePath := paths[0]
 
-			yamlBytes, err := st.RenderValuesFileToBytes(yamlOrTemplatePath)
+			yamlBytes, err := st.RenderReleaseValuesFileToBytes(release, yamlOrTemplatePath)
 			if err != nil {
 				return nil, fmt.Errorf("failed to render values files \"%s\": %v", t, err)
 			}