Skip to content

allow using helmChart without repo URL #5819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aarnaud wants to merge 1 commit into
base: master
Choose a base branch
from
Open

allow using helmChart without repo URL #5819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/internal/builtins/HelmChartInflationGenerator.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,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
Expand Down Expand Up @@ -361,7 +361,7 @@ func (p *plugin) chartExistsLocally() (string, bool) {
path := filepath.Join(p.absChartHome(), p.Name)
s, err := os.Stat(path)
if err != nil {
return "", false
return path, false
}
return path, s.IsDir()
}
Expand Down
6 changes: 3 additions & 3 deletions plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,7 +847,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)
Expand Down Expand Up @@ -949,7 +949,7 @@ chartHome: ./charts
require.NoError(t, err)
assert.Equal(t, "bar", cm)

chartDir := filepath.Join(th.GetRoot(), "charts/test-chart")
chartDir := filepath.Join(th.GetRoot(), "charts/test-chart-1.0.0/test-chart")
assert.True(t, th.GetFSys().Exists(chartDir))

chartYamlContent, err := th.GetFSys().ReadFile(filepath.Join(chartDir, "Chart.yaml"))
Expand Down Expand Up @@ -983,7 +983,7 @@ debug: true
require.NoError(t, err)
assert.Equal(t, "bar", cm)

chartDir := filepath.Join(th.GetRoot(), "charts/test-chart")
chartDir := filepath.Join(th.GetRoot(), "charts/test-chart-1.0.0/test-chart")
assert.True(t, th.GetFSys().Exists(chartDir))

chartYamlContent, err := th.GetFSys().ReadFile(filepath.Join(chartDir, "Chart.yaml"))
Expand Down
0 ...tor/testdata/charts/test-chart/Chart.yaml → ...ts/test-chart-1.0.0/test-chart/Chart.yaml
View file
Open in desktop
File renamed without changes.
0 ...harts/test-chart/templates/configmap.yaml → ...1.0.0/test-chart/templates/configmap.yaml
View file
Open in desktop
File renamed without changes.
0 ...or/testdata/charts/test-chart/values.yaml → ...s/test-chart-1.0.0/test-chart/values.yaml
View file
Open in desktop
File renamed without changes.
Loading