From 8ecd87d944447d6d59afe6b9984df0e2d3ccac36 Mon Sep 17 00:00:00 2001 From: Eric Klatzer Date: Sat, 14 Feb 2026 17:43:30 +0100 Subject: [PATCH] fix for file:// dependency chart path resolutions (#510) Signed-off-by: Eric Klatzer --- cmd/hauler/cli/store/add.go | 3 +-- .../chart-with-file-dependency-chart-1.0.0.tgz | Bin 0 -> 691 bytes testdata/hauler-manifest-pipeline.yaml | 3 +++ 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 testdata/chart-with-file-dependency-chart-1.0.0.tgz diff --git a/cmd/hauler/cli/store/add.go b/cmd/hauler/cli/store/add.go index cef1994..faf3134 100644 --- a/cmd/hauler/cli/store/add.go +++ b/cmd/hauler/cli/store/add.go @@ -520,8 +520,7 @@ func storeChart(ctx context.Context, s *store.Layout, cfg v1.Chart, opts *flags. var err error if strings.HasPrefix(dep.Repository, "file://") { - depPath := strings.TrimPrefix(dep.Repository, "file://") - subchartPath := filepath.Join(chartPath, depPath) + subchartPath := filepath.Join(chartPath, "charts", dep.Name) depCfg = v1.Chart{Name: subchartPath, RepoURL: "", Version: ""} depOpts.ChartOpts.RepoURL = "" diff --git a/testdata/chart-with-file-dependency-chart-1.0.0.tgz b/testdata/chart-with-file-dependency-chart-1.0.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..30d96ee1da172a04345a37900b8f865aef35b51d GIT binary patch literal 691 zcmV;k0!;lMiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PL5+a=SJV#yRs8np``Wl@Jo>)S33!W2g58Ew&~Y7^J4-x9?yF z$8l%kgmm2g6MhGCSnUdozWtVZhhs?oa$%P=uBF7%K%J$oJ|xFb`pfjYIpDsHmI45v zq&!{$;Q9(eiiqc2W=e7Z9Rb&w77>HRJAQyaeZVn-Pw#d8a6bq*xIbw0uI~(c67l)< zJMtz@SciKutlqiS#*B?L^xlPjJQy~e7L%r%O*%)P<~m{n8;IxBx6fA`4g(p6!_c}K zgX_EaT!$a){MY}`*XEu2Z~OXj@gBGIpK&?sA2b(7{i{{~ci~?Yymedh!7#r=ktu5Z$ zPp+Tjgxlkm4BOV@#`URnK8$@!-lr9M`uVxF=?1lwxos+{kYpn(jTMlhrYwb4R4ULp zk`#F%u~DK>6+!_z2divD`TwX>-PHf_*PnX+!jFMl`UidC{~#j}TuZ&`{~lb;|Cjdv z#$+zm$^47(G5s$a25$R5fAN115r`br>i>6Pq5sdH0ROQ6Q{Xf1KbKx${&VVkz5iwX ZceMVMm6dPK-vIys|Nr&{X;=Ul007d;T~Po4 literal 0 HcmV?d00001 diff --git a/testdata/hauler-manifest-pipeline.yaml b/testdata/hauler-manifest-pipeline.yaml index 6188541..dc1051d 100755 --- a/testdata/hauler-manifest-pipeline.yaml +++ b/testdata/hauler-manifest-pipeline.yaml @@ -34,6 +34,9 @@ spec: version: 1.0.4 - name: rancher-cluster-templates-0.5.2.tgz repoURL: testdata + - name: chart-with-file-dependency-chart-1.0.0.tgz + repoURL: testdata + add-dependencies: true --- apiVersion: content.hauler.cattle.io/v1 kind: Files