From 19790f61e21db3ba1a8b89cd246e881cab8a247f Mon Sep 17 00:00:00 2001 From: admju Date: Wed, 18 Sep 2024 08:41:47 +0000 Subject: [PATCH] Correction chart via repo --- src/install/install.go | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/install/install.go b/src/install/install.go index de5f7d0..c359221 100644 --- a/src/install/install.go +++ b/src/install/install.go @@ -60,13 +60,15 @@ func (this *InstallClass) InstallCharts(modules []string) (error) { var wg sync.WaitGroup for _, v := range this.charts { + repoName := v.Repository.Name + for _, v1 := range v.Charts { if len(modules) == 0 || utils.StringInSlice(v1.Name, modules) { wg.Add(1) go func() { defer wg.Done() - this.installChart(v1) + this.installChart(repoName, v1) } () } } @@ -75,12 +77,19 @@ func (this *InstallClass) InstallCharts(modules []string) (error) { return nil } -func (this *InstallClass) installChart(chart chart.ChartData) { +func (this *InstallClass) installChart(repoName string, chart chart.ChartData) { log.Log().Info().Msg(fmt.Sprintf(" << Chart : %s ", chart.Name)) + chartName := chart.Chart + if chartName == "" { + chartName = chart.Name + } + if repoName != "" { + chartName = fmt.Sprintf("%s/%s", repoName, chartName) + } data := helm.HelmChart{Name: chart.Name, - Chart: chart.Chart, + Chart: chartName, Url: chart.Url, Version: chart.Version, Workspace: this.Workspace,