Fix p.ValuesFile when version is set

dlish · Mar 22, 2023 · 2dcdc7b · 2dcdc7b
1 parent 2da1dbd
commit 2dcdc7b
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator.go b/plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator.go
@@ -97,7 +97,11 @@ func (p *plugin) validateArgs() (err error) {
 	// be under the loader root (unless root restrictions are
 	// disabled).
 	if p.ValuesFile == "" {
-		p.ValuesFile = filepath.Join(p.ChartHome, p.Name, "values.yaml")
+		if p.Version != "" {
+			p.ValuesFile = filepath.Join(p.ChartHome, fmt.Sprintf("%s-%s", p.Name, p.Version), p.Name, "values.yaml")
+		} else {
+			p.ValuesFile = filepath.Join(p.ChartHome, p.Name, "values.yaml")
+		}
 	}
 	for i, file := range p.AdditionalValuesFiles {
 		// use Load() to enforce root restrictions