fix issue with local values file

kubernetes-sigs · Dec 12, 2022 · 9804a00 · 9804a00
1 parent 725c473
commit 9804a00
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/api/internal/builtins/HelmChartInflationGenerator.go b/api/internal/builtins/HelmChartInflationGenerator.go
diff --git a/plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator.go b/plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator.go
@@ -100,6 +100,11 @@ func (p *plugin) validateArgs() (err error) {
 	// The ValuesFile may be consulted by the plugin, so it must
 	// be under the loader root (unless root restrictions are
 	// disabled).
+	for i, file := range p.ValuesFiles {
+		if u, urlErr := url.Parse(file); urlErr != nil || u.Scheme == "" {
+			p.ValuesFiles[i] = filepath.Join(p.h.Loader().Root(), file)
+		}
+	}
 	if len(p.ValuesFiles) == 0 {
 		p.ValuesFiles = append(p.ValuesFiles, filepath.Join(p.absChartHome(), p.Name, "values.yaml"))
 	}

diff --git a/plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator_test.go b/plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator_test.go
@@ -420,7 +420,8 @@ name: minecraft
 version: 3.1.3
 repo: https://itzg.github.io/minecraft-server-charts
 releaseName: moria
-valuesFile: myValues.yaml
+valuesFiles: 
+- myValues.yaml
 `)
 	th.AssertActualEqualsExpected(
 		rm, fmt.Sprintf(expectedInflationFmt,