From 19fcdd6f15b6acbe4c3302e872364a042f1eb962 Mon Sep 17 00:00:00 2001 From: Julian Siebert Date: Thu, 26 Feb 2026 10:45:11 +0100 Subject: [PATCH] fix(pkg): respect subchart conditions when dependency uses an alias in v3 & add logging Signed-off-by: Julian Siebert --- internal/chart/v3/util/dependencies.go | 15 +++++++++++ internal/chart/v3/util/dependencies_test.go | 26 +++++++++++++++++++ .../alias-condition-nested/Chart.yaml | 9 +++++++ .../charts/mid/Chart.yaml | 9 +++++++ .../charts/mid/charts/leaf/Chart.yaml | 8 ++++++ .../mid/charts/leaf/charts/util/Chart.yaml | 3 +++ .../mid/charts/leaf/charts/util/values.yaml | 1 + .../charts/mid/charts/leaf/values.yaml | 3 +++ .../charts/mid/values.yaml | 2 ++ .../alias-condition-nested/values.yaml | 2 ++ pkg/chart/v2/util/dependencies.go | 8 ++++-- 11 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 internal/chart/v3/util/testdata/alias-condition-nested/Chart.yaml create mode 100644 internal/chart/v3/util/testdata/alias-condition-nested/charts/mid/Chart.yaml create mode 100644 internal/chart/v3/util/testdata/alias-condition-nested/charts/mid/charts/leaf/Chart.yaml create mode 100644 internal/chart/v3/util/testdata/alias-condition-nested/charts/mid/charts/leaf/charts/util/Chart.yaml create mode 100644 internal/chart/v3/util/testdata/alias-condition-nested/charts/mid/charts/leaf/charts/util/values.yaml create mode 100644 internal/chart/v3/util/testdata/alias-condition-nested/charts/mid/charts/leaf/values.yaml create mode 100644 internal/chart/v3/util/testdata/alias-condition-nested/charts/mid/values.yaml create mode 100644 internal/chart/v3/util/testdata/alias-condition-nested/values.yaml diff --git a/internal/chart/v3/util/dependencies.go b/internal/chart/v3/util/dependencies.go index 9c4d8e80f..91427091a 100644 --- a/internal/chart/v3/util/dependencies.go +++ b/internal/chart/v3/util/dependencies.go @@ -214,6 +214,21 @@ Loop: // recursively call self to process sub dependencies for _, t := range cd { + // cvals[path][alias] may be stale when an alias is used, because ancestor + // CoalesceValues calls used the original chart name. Fill in missing keys from the + // correctly-coalesced top-level entry, keeping the nested entry authoritative. + if path != "" { + if pt, err := cvals.Table(strings.TrimSuffix(path, ".")); err == nil { + if top, ok := cvals[t.Metadata.Name].(map[string]interface{}); ok { + if v, ok := pt[t.Metadata.Name]; ok && !istable(v) { + slog.Warn("skipping nested path update: value is not a table", "path", path+t.Metadata.Name) + } else { + nested, _ := v.(map[string]interface{}) + pt[t.Metadata.Name] = util.CoalesceTables(nested, top) + } + } + } + } subpath := path + t.Metadata.Name + "." if err := processDependencyEnabled(t, cvals, subpath); err != nil { return err diff --git a/internal/chart/v3/util/dependencies_test.go b/internal/chart/v3/util/dependencies_test.go index 3c5bb96f7..8b3d458e8 100644 --- a/internal/chart/v3/util/dependencies_test.go +++ b/internal/chart/v3/util/dependencies_test.go @@ -552,6 +552,32 @@ func validateDependencyTree(t *testing.T, c *chart.Chart) { } } +func TestDependencyEnabledAliasNestedCondition(t *testing.T) { + // Chart structure: + // parentchart -> mid (alias: midchart) -> leaf (alias: leafchart) -> util (condition: util.enabled) + // + // leaf/values.yaml sets util.enabled: false. + // No user-provided values override this. + // Expected: util is NOT included in the output. + c := loadChart(t, "testdata/alias-condition-nested") + if err := processDependencyEnabled(c, c.Values, ""); err != nil { + t.Fatalf("error processing enabled dependencies: %v", err) + } + + names := extractChartNames(c) + expected := []string{"parentchart", "parentchart.midchart", "parentchart.midchart.leafchart"} + sort.Strings(expected) + + if len(names) != len(expected) { + t.Fatalf("slice lengths do not match: got %v, expected %v", names, expected) + } + for i := range names { + if names[i] != expected[i] { + t.Fatalf("slice values do not match: got %v, expected %v", names, expected) + } + } +} + func TestChartWithDependencyAliasedTwiceAndDoublyReferencedSubDependency(t *testing.T) { c := loadChart(t, "testdata/chart-with-dependency-aliased-twice") diff --git a/internal/chart/v3/util/testdata/alias-condition-nested/Chart.yaml b/internal/chart/v3/util/testdata/alias-condition-nested/Chart.yaml new file mode 100644 index 000000000..8cab888a3 --- /dev/null +++ b/internal/chart/v3/util/testdata/alias-condition-nested/Chart.yaml @@ -0,0 +1,9 @@ +apiVersion: v3 +name: parentchart +version: 0.1.0 +dependencies: + - name: mid + repository: http://localhost:10191 + version: 0.1.0 + alias: midchart + condition: midchart.enabled diff --git a/internal/chart/v3/util/testdata/alias-condition-nested/charts/mid/Chart.yaml b/internal/chart/v3/util/testdata/alias-condition-nested/charts/mid/Chart.yaml new file mode 100644 index 000000000..9009efc75 --- /dev/null +++ b/internal/chart/v3/util/testdata/alias-condition-nested/charts/mid/Chart.yaml @@ -0,0 +1,9 @@ +apiVersion: v3 +name: mid +version: 0.1.0 +dependencies: + - name: leaf + repository: http://localhost:10191 + version: 0.1.0 + alias: leafchart + condition: leafchart.enabled diff --git a/internal/chart/v3/util/testdata/alias-condition-nested/charts/mid/charts/leaf/Chart.yaml b/internal/chart/v3/util/testdata/alias-condition-nested/charts/mid/charts/leaf/Chart.yaml new file mode 100644 index 000000000..8477bef5f --- /dev/null +++ b/internal/chart/v3/util/testdata/alias-condition-nested/charts/mid/charts/leaf/Chart.yaml @@ -0,0 +1,8 @@ +apiVersion: v3 +name: leaf +version: 0.1.0 +dependencies: + - name: util + repository: http://localhost:10191 + version: 0.1.0 + condition: util.enabled diff --git a/internal/chart/v3/util/testdata/alias-condition-nested/charts/mid/charts/leaf/charts/util/Chart.yaml b/internal/chart/v3/util/testdata/alias-condition-nested/charts/mid/charts/leaf/charts/util/Chart.yaml new file mode 100644 index 000000000..b9ddc5115 --- /dev/null +++ b/internal/chart/v3/util/testdata/alias-condition-nested/charts/mid/charts/leaf/charts/util/Chart.yaml @@ -0,0 +1,3 @@ +apiVersion: v3 +name: util +version: 0.1.0 diff --git a/internal/chart/v3/util/testdata/alias-condition-nested/charts/mid/charts/leaf/charts/util/values.yaml b/internal/chart/v3/util/testdata/alias-condition-nested/charts/mid/charts/leaf/charts/util/values.yaml new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/internal/chart/v3/util/testdata/alias-condition-nested/charts/mid/charts/leaf/charts/util/values.yaml @@ -0,0 +1 @@ +{} diff --git a/internal/chart/v3/util/testdata/alias-condition-nested/charts/mid/charts/leaf/values.yaml b/internal/chart/v3/util/testdata/alias-condition-nested/charts/mid/charts/leaf/values.yaml new file mode 100644 index 000000000..54d7c9524 --- /dev/null +++ b/internal/chart/v3/util/testdata/alias-condition-nested/charts/mid/charts/leaf/values.yaml @@ -0,0 +1,3 @@ +# util is disabled by default in this chart's values +util: + enabled: false diff --git a/internal/chart/v3/util/testdata/alias-condition-nested/charts/mid/values.yaml b/internal/chart/v3/util/testdata/alias-condition-nested/charts/mid/values.yaml new file mode 100644 index 000000000..de12ce852 --- /dev/null +++ b/internal/chart/v3/util/testdata/alias-condition-nested/charts/mid/values.yaml @@ -0,0 +1,2 @@ +leafchart: + enabled: true diff --git a/internal/chart/v3/util/testdata/alias-condition-nested/values.yaml b/internal/chart/v3/util/testdata/alias-condition-nested/values.yaml new file mode 100644 index 000000000..4ef046569 --- /dev/null +++ b/internal/chart/v3/util/testdata/alias-condition-nested/values.yaml @@ -0,0 +1,2 @@ +midchart: + enabled: true diff --git a/pkg/chart/v2/util/dependencies.go b/pkg/chart/v2/util/dependencies.go index 65524c66f..727d0dcf0 100644 --- a/pkg/chart/v2/util/dependencies.go +++ b/pkg/chart/v2/util/dependencies.go @@ -220,8 +220,12 @@ Loop: if path != "" { if pt, err := cvals.Table(strings.TrimSuffix(path, ".")); err == nil { if top, ok := cvals[t.Metadata.Name].(map[string]interface{}); ok { - nested, _ := pt[t.Metadata.Name].(map[string]interface{}) - pt[t.Metadata.Name] = util.CoalesceTables(nested, top) + if v, ok := pt[t.Metadata.Name]; ok && !istable(v) { + slog.Warn("skipping nested path update: value is not a table", "path", path+t.Metadata.Name) + } else { + nested, _ := v.(map[string]interface{}) + pt[t.Metadata.Name] = util.CoalesceTables(nested, top) + } } } }