From 8b0ad72e77d718ba4758b870f16349e499a8ff72 Mon Sep 17 00:00:00 2001 From: Viktor Oreshkin Date: Thu, 1 Sep 2022 02:14:40 +0300 Subject: [PATCH] feat: dont prepare on list This changes list command so it doesn't run withPreparedCharts, and just lists releases instead Signed-off-by: Viktor Oreshkin --- pkg/app/app.go | 79 ++++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 45 deletions(-) diff --git a/pkg/app/app.go b/pkg/app/app.go index d3067c4a..04f028cd 100644 --- a/pkg/app/app.go +++ b/pkg/app/app.go @@ -547,53 +547,42 @@ func (a *App) ListReleases(c ListConfigProvider) error { var releases []*HelmRelease err := a.ForEachState(func(run *Run) (_ bool, errs []error) { - err := run.withPreparedCharts("list", state.ChartPrepareOptions{ - SkipRepos: true, - SkipDeps: true, - Concurrency: 2, - }, func() { - // var releases m - for _, r := range run.state.Releases { - labels := "" - if r.Labels == nil { - r.Labels = map[string]string{} - } - for k, v := range run.state.CommonLabels { - r.Labels[k] = v - } - - var keys []string - for k := range r.Labels { - keys = append(keys, k) - } - sort.Strings(keys) - - for _, k := range keys { - v := r.Labels[k] - labels = fmt.Sprintf("%s,%s:%s", labels, k, v) - } - labels = strings.Trim(labels, ",") - - enabled, err := state.ConditionEnabled(r, run.state.Values()) - if err != nil { - panic(err) - } - - installed := r.Installed == nil || *r.Installed - releases = append(releases, &HelmRelease{ - Name: r.Name, - Namespace: r.Namespace, - Installed: installed, - Enabled: enabled, - Labels: labels, - Chart: r.Chart, - Version: r.Version, - }) + for _, r := range run.state.Releases { + labels := "" + if r.Labels == nil { + r.Labels = map[string]string{} + } + for k, v := range run.state.CommonLabels { + r.Labels[k] = v } - }) - if err != nil { - errs = append(errs, err) + var keys []string + for k := range r.Labels { + keys = append(keys, k) + } + sort.Strings(keys) + + for _, k := range keys { + v := r.Labels[k] + labels = fmt.Sprintf("%s,%s:%s", labels, k, v) + } + labels = strings.Trim(labels, ",") + + enabled, err := state.ConditionEnabled(r, run.state.Values()) + if err != nil { + panic(err) + } + + installed := r.Installed == nil || *r.Installed + releases = append(releases, &HelmRelease{ + Name: r.Name, + Namespace: r.Namespace, + Installed: installed, + Enabled: enabled, + Labels: labels, + Chart: r.Chart, + Version: r.Version, + }) } return