fix #5818 allow using helmChart without repo URL.

aarnaud · aarnaud · commit aab14c327620 · 2024-12-03T11:35:44.000-05:00
Signed-off-by: Anthony ARNAUD &lt;github@anthony-arnaud.fr&gt;
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
@@ -159,7 +159,7 @@ func (p *plugin) absChartHome() string {
 		chartHome = filepath.Join(p.h.Loader().Root(), p.ChartHome)
 	}
 
-	if p.Version != "" && p.Repo != "" {
+	if p.Version != "" {
 		return filepath.Join(chartHome, fmt.Sprintf("%s-%s", p.Name, p.Version))
 	}
 	return chartHome
diff --git a/plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator_test.go b/plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator_test.go
@@ -849,7 +849,7 @@ releaseName: %s
 			assert.True(t, len(rm.Resources()) > 0)
 
 			var chartDir string
-			if tt.version != "" && tt.repo != "" {
+			if tt.version != "" {
 				chartDir = fmt.Sprintf("charts/%s-%s/%s", tt.chartName, tt.version, tt.chartName)
 			} else {
 				chartDir = fmt.Sprintf("charts/%s", tt.chartName)

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ func (p *plugin) absChartHome() string {`
`159`	`159`	`chartHome = filepath.Join(p.h.Loader().Root(), p.ChartHome)`
`160`	`160`	`}`
`161`	`161`
`162`		`- if p.Version != "" && p.Repo != "" {`
	`162`	`+ if p.Version != "" {`
`163`	`163`	`return filepath.Join(chartHome, fmt.Sprintf("%s-%s", p.Name, p.Version))`
`164`	`164`	`}`
`165`	`165`	`return chartHome`