Skip to content

Fix subcharts dependencies processing #10174

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

Closed
vflaux wants to merge 1 commit into from
Closed

Fix subcharts dependencies processing #10174

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
9 changes: 9 additions & 0 deletions pkg/chartutil/dependencies.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,15 @@ func getAliasDependency(charts []*chart.Chart, dep *chart.Dependency) *chart.Cha
md := *c.Metadata
out.Metadata = &md

if md.Dependencies != nil {
dependencies := make([]*chart.Dependency, len(md.Dependencies))
for i := range md.Dependencies {
d := *md.Dependencies[i]
dependencies[i] = &d
}
md.Dependencies = dependencies
}

if dep.Alias != "" {
md.Name = dep.Alias
}
Expand Down
20 changes: 17 additions & 3 deletions pkg/chartutil/dependencies_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,22 +312,36 @@ func TestDependentChartAliases(t *testing.T) {
c := loadChart(t, "testdata/dependent-chart-alias")
req := c.Metadata.Dependencies

if len(c.Dependencies()) != 2 {
t.Fatalf("expected 2 dependencies for this chart, but got %d", len(c.Dependencies()))
if len(c.Dependencies()) != 3 {
t.Fatalf("expected 3 dependencies for this chart, but got %d", len(c.Dependencies()))
}

if err := processDependencyEnabled(c, c.Values, ""); err != nil {
t.Fatalf("expected no errors but got %q", err)
}

if len(c.Dependencies()) != 3 {
if len(c.Dependencies()) != 5 {
t.Fatal("expected alias dependencies to be added")
}

if len(c.Dependencies()) != len(c.Metadata.Dependencies) {
t.Fatalf("expected number of chart dependencies %d, but got %d", len(c.Metadata.Dependencies), len(c.Dependencies()))
}

for _, dep := range c.Dependencies() {
if len(dep.Metadata.Dependencies) == 0 {
continue
}
if len(dep.Dependencies()) != len(dep.Metadata.Dependencies) {
t.Fatalf("subchart %s: expected number of dependencies %d, but got %d", dep.Name(), len(dep.Metadata.Dependencies), len(dep.Dependencies()))
}
for i := range dep.Dependencies() {
if dep.Metadata.Dependencies[i].Name != dep.Dependencies()[i].Name() {
t.Fatalf("subchart %s: expected name %s, but got %s", dep.Name(), dep.Metadata.Dependencies[i].Name, dep.Dependencies()[i].Name())
}
}
}

aliasChart := getAliasDependency(c.Dependencies(), req[2])

if aliasChart == nil {
Expand Down
8 changes: 8 additions & 0 deletions pkg/chartutil/testdata/dependent-chart-alias/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,11 @@ dependencies:
version: "4.3.2"
repository: https://example.com/charts
alias: mariners1
- name: gizmo
version: "0.1.0"
repository: https://example.com/charts
alias: gizmo1
- name: gizmo
version: "0.1.0"
repository: https://example.com/charts
alias: gizmo2
12 changes: 12 additions & 0 deletions pkg/chartutil/testdata/dependent-chart-alias/charts/gizmo/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
apiVersion: v1
name: gizmo
description: Deploy a basic Alpine Linux pod
version: 0.1.0
home: https://helm.sh/helm
dependencies:
- name: frobule
version: 0.1.0
alias: frobozz1
- name: frobule
version: 0.1.0
alias: frobozz2
5 changes: 5 additions & 0 deletions pkg/chartutil/testdata/dependent-chart-alias/charts/gizmo/charts/frobule/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
apiVersion: v1
name: frobule
description: Deploy a basic Alpine Linux pod
version: 0.1.0
home: https://helm.sh/helm