feat: skip deps when installed is false (#1054)
Signed-off-by: yxxhero <aiopsclub@163.com>
This commit is contained in:
parent
d5a6553664
commit
212c39cb53
|
|
@ -662,11 +662,10 @@ func (a *App) list(run *Run) ([]*HelmRelease, error) {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
installed := r.Installed == nil || *r.Installed
|
|
||||||
releases = append(releases, &HelmRelease{
|
releases = append(releases, &HelmRelease{
|
||||||
Name: r.Name,
|
Name: r.Name,
|
||||||
Namespace: r.Namespace,
|
Namespace: r.Namespace,
|
||||||
Installed: installed,
|
Installed: r.Desired(),
|
||||||
Enabled: enabled,
|
Enabled: enabled,
|
||||||
Labels: labels,
|
Labels: labels,
|
||||||
Chart: r.Chart,
|
Chart: r.Chart,
|
||||||
|
|
@ -1685,7 +1684,7 @@ func (a *App) status(r *Run, c StatusesConfigProvider) (bool, []error) {
|
||||||
|
|
||||||
var toStatus []state.ReleaseSpec
|
var toStatus []state.ReleaseSpec
|
||||||
for _, r := range selectedReleases {
|
for _, r := range selectedReleases {
|
||||||
if r.Installed != nil && !*r.Installed {
|
if !r.Desired() {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
toStatus = append(toStatus, r)
|
toStatus = append(toStatus, r)
|
||||||
|
|
|
||||||
|
|
@ -223,6 +223,10 @@ func getUnresolvedDependenciess(st *HelmState) (string, *UnresolvedDependencies,
|
||||||
unresolved := &UnresolvedDependencies{deps: map[string][]unresolvedChartDependency{}}
|
unresolved := &UnresolvedDependencies{deps: map[string][]unresolvedChartDependency{}}
|
||||||
|
|
||||||
for _, r := range st.Releases {
|
for _, r := range st.Releases {
|
||||||
|
if !r.Desired() {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
repo, chart, ok := resolveRemoteChart(r.Chart)
|
repo, chart, ok := resolveRemoteChart(r.Chart)
|
||||||
if !ok {
|
if !ok {
|
||||||
continue
|
continue
|
||||||
|
|
|
||||||
|
|
@ -1021,7 +1021,7 @@ func releasesNeedCharts(releases []ReleaseSpec) []ReleaseSpec {
|
||||||
var result []ReleaseSpec
|
var result []ReleaseSpec
|
||||||
|
|
||||||
for _, r := range releases {
|
for _, r := range releases {
|
||||||
if r.Installed != nil && !*r.Installed {
|
if !r.Desired() {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
result = append(result, r)
|
result = append(result, r)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue