From 8c14aa9a7fea88703c6420e0dda64ff283bee7e6 Mon Sep 17 00:00:00 2001 From: Jonas Rutishauser Date: Mon, 12 Oct 2020 14:59:57 +0200 Subject: [PATCH] feat(helm): support subcharts from chartcenter `helm package`, `helm template` and `helm install` will now work if a subchart from chartcenter is used. This fixes #8537 Signed-off-by: Jonas Rutishauser --- cmd/helm/install_test.go | 5 +++++ .../testdata/testcharts/chartcenter/Chart.yaml | 8 ++++++++ .../chartcenter/charts/mariadb-4.3.1.tgz | Bin 0 -> 8401 bytes pkg/action/install.go | 6 +++++- 4 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 cmd/helm/testdata/testcharts/chartcenter/Chart.yaml create mode 100644 cmd/helm/testdata/testcharts/chartcenter/charts/mariadb-4.3.1.tgz diff --git a/cmd/helm/install_test.go b/cmd/helm/install_test.go index 6892fcd86..8b02b567b 100644 --- a/cmd/helm/install_test.go +++ b/cmd/helm/install_test.go @@ -201,6 +201,11 @@ func TestInstall(t *testing.T) { name: "install chart with only crds", cmd: "install crd-test testdata/testcharts/chart-with-only-crds --namespace default", }, + // Install with subchart from chartcenter + { + name: "install with subchart from chartcenter", + cmd: "install chartcenter testdata/testcharts/chartcenter --namespace default", + }, } runTestActionCmd(t, tests) diff --git a/cmd/helm/testdata/testcharts/chartcenter/Chart.yaml b/cmd/helm/testdata/testcharts/chartcenter/Chart.yaml new file mode 100644 index 000000000..15f308cd1 --- /dev/null +++ b/cmd/helm/testdata/testcharts/chartcenter/Chart.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +description: A Helm chart for Kubernetes +name: chartcenter +version: 0.1.0 +dependencies: + - name: stable/mariadb + version: 4.x.x + repository: "https://repo.chartcenter.io" diff --git a/cmd/helm/testdata/testcharts/chartcenter/charts/mariadb-4.3.1.tgz b/cmd/helm/testdata/testcharts/chartcenter/charts/mariadb-4.3.1.tgz new file mode 100644 index 0000000000000000000000000000000000000000..5b38fa1c399527b1e3dc452bd90e5e8312c7051a GIT binary patch literal 8401 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 literal 0 HcmV?d00001 diff --git a/pkg/action/install.go b/pkg/action/install.go index caeefca68..7a6ac5adb 100644 --- a/pkg/action/install.go +++ b/pkg/action/install.go @@ -594,8 +594,12 @@ func CheckDependencies(ch *chart.Chart, reqs []*chart.Dependency) error { OUTER: for _, r := range reqs { + req := r.Name + if idx := strings.LastIndex(req, "/"); idx >= 0 { + req = req[idx+1:] + } for _, d := range ch.Dependencies() { - if d.Name() == r.Name { + if d.Name() == req { continue OUTER } }