Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion chartify.go
Original file line number Diff line number Diff line change
Expand Up @@ -624,10 +624,15 @@ func (r *Runner) ReadAdhocDependencies(u *ChartifyOpts) ([]Dependency, error) {
condName = name
}

condition := d.Condition
if condition == "" {
condition = fmt.Sprintf("%s.enabled", condName)
}

deps = append(deps, Dependency{
Name: name,
Repository: repoUrl,
Condition: fmt.Sprintf("%s.enabled", condName),
Condition: condition,
Alias: d.Alias,
Version: d.Version,
})
Expand Down
39 changes: 39 additions & 0 deletions chartify_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,45 @@ func TestReadAdhocDependencies(t *testing.T) {
},
})

run(testcase{
opts: ChartifyOpts{
AdhocChartDependencies: []ChartDependency{
{
Alias: "mydb",
Chart: "./testdata/charts/db",
Condition: "global.mydb.enabled",
},
},
},
wantDendency: []Dependency{
{
Repository: "file://./testdata/charts/db",
Name: "db",
Alias: "mydb",
Condition: "global.mydb.enabled",
},
},
})

run(testcase{
opts: ChartifyOpts{
AdhocChartDependencies: []ChartDependency{
{
Alias: "mydb",
Chart: "./testdata/charts/db",
},
},
},
wantDendency: []Dependency{
{
Repository: "file://./testdata/charts/db",
Name: "db",
Alias: "mydb",
Condition: "mydb.enabled",
},
},
})

run(testcase{
opts: ChartifyOpts{
AdhocChartDependencies: []ChartDependency{
Expand Down
3 changes: 3 additions & 0 deletions requirements.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ type ChartDependency struct {
Alias string
Chart string
Version string
// Condition is written to the dependency's `condition` field.
// When empty, it defaults to `<alias or chart name>.enabled`.
Condition string
}

// UpdateRequirements updates either Chart.yaml's dependencies(helm 3) or requirements.yaml(helm 2)
Expand Down