From 212c39cb533876eb87b083c2c6cc909ad7b8664c Mon Sep 17 00:00:00 2001 From: yxxhero <11087727+yxxhero@users.noreply.github.com> Date: Sat, 7 Oct 2023 02:16:05 -0500 Subject: [PATCH] feat: skip deps when installed is false (#1054) Signed-off-by: yxxhero --- pkg/app/app.go | 5 ++--- pkg/state/chart_dependency.go | 4 ++++ pkg/state/state.go | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkg/app/app.go b/pkg/app/app.go index 6a7ffd36..cc7d87cb 100644 --- a/pkg/app/app.go +++ b/pkg/app/app.go @@ -662,11 +662,10 @@ func (a *App) list(run *Run) ([]*HelmRelease, error) { return nil, err } - installed := r.Installed == nil || *r.Installed releases = append(releases, &HelmRelease{ Name: r.Name, Namespace: r.Namespace, - Installed: installed, + Installed: r.Desired(), Enabled: enabled, Labels: labels, Chart: r.Chart, @@ -1685,7 +1684,7 @@ func (a *App) status(r *Run, c StatusesConfigProvider) (bool, []error) { var toStatus []state.ReleaseSpec for _, r := range selectedReleases { - if r.Installed != nil && !*r.Installed { + if !r.Desired() { continue } toStatus = append(toStatus, r) diff --git a/pkg/state/chart_dependency.go b/pkg/state/chart_dependency.go index a514a27e..69550429 100644 --- a/pkg/state/chart_dependency.go +++ b/pkg/state/chart_dependency.go @@ -223,6 +223,10 @@ func getUnresolvedDependenciess(st *HelmState) (string, *UnresolvedDependencies, unresolved := &UnresolvedDependencies{deps: map[string][]unresolvedChartDependency{}} for _, r := range st.Releases { + if !r.Desired() { + continue + } + repo, chart, ok := resolveRemoteChart(r.Chart) if !ok { continue diff --git a/pkg/state/state.go b/pkg/state/state.go index 3c284851..646f1d20 100644 --- a/pkg/state/state.go +++ b/pkg/state/state.go @@ -1021,7 +1021,7 @@ func releasesNeedCharts(releases []ReleaseSpec) []ReleaseSpec { var result []ReleaseSpec for _, r := range releases { - if r.Installed != nil && !*r.Installed { + if !r.Desired() { continue } result = append(result, r)