public_git
/
helmfile
mirror of https://github.com/helmfile/helmfile.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix tests 

Signed-off-by: yxxhero <aiopsclub@163.com>
This commit is contained in:
yxxhero 2023-09-09 22:02:35 +08:00
parent e919131f17
commit 9f7f5c02a8
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/app/app.go
View File

@ -1918,7 +1918,7 @@ func (a *App) template(r *Run, c TemplateConfigProvider) (bool, []error) {
func (a *App) withNeeds(r *Run, c DAGConfig, includeDisabled bool, f func(*state.HelmState) []error) (bool, []error) {
st := r.state
selectedReleases, deduplicated, err := a.getSelectedReleases(r, false)
selectedReleases, deduplicated, err := a.getSelectedReleases(r, c.IncludeTransitiveNeeds())
if err != nil {
return false, []error{err}
}
@ -1968,7 +1968,7 @@ func (a *App) withNeeds(r *Run, c DAGConfig, includeDisabled bool, f func(*state
// That's why we don't pass in `IncludeNeeds: c.IncludeNeeds(), IncludeTransitiveNeeds: c.IncludeTransitiveNeeds()` here.
// Otherwise, in case include-needs=true, it will include the needs of needs, which results in unexpectedly introducing transitive needs,
// even if include-transitive-needs=true is unspecified.
if _, errs := withDAG(st, r.helm, a.Logger, state.PlanOptions{SelectedReleases: toRender, Reverse: false, SkipNeeds: c.SkipNeeds(), IncludeNeeds: includeNeeds}, a.WrapWithoutSelector(func(subst *state.HelmState, helm helmexec.Interface) []error {
if _, errs := withDAG(st, r.helm, a.Logger, state.PlanOptions{SelectedReleases: toRender, Reverse: false, SkipNeeds: c.SkipNeeds(), IncludeNeeds: includeNeeds, IncludeTransitiveNeeds: c.IncludeTransitiveNeeds()}, a.WrapWithoutSelector(func(subst *state.HelmState, helm helmexec.Interface) []error {
rels = append(rels, subst.Releases...)
return nil
})); len(errs) > 0 {

2
pkg/config/apply.go
View File

@ -164,7 +164,7 @@ func (a *ApplyImpl) DiffArgs() string {
// SkipNeeds returns the skip needs.
func (a *ApplyImpl) SkipNeeds() bool {
if !a.IncludeNeeds() {
if !a.IncludeNeeds() && !a.IncludeTransitiveNeeds() {
return a.ApplyOptions.SkipNeeds
}
return false

2
pkg/config/diff.go
View File

@ -87,7 +87,7 @@ func (t *DiffImpl) Set() []string {
// SkipNeeds returns the skip needs
func (t *DiffImpl) SkipNeeds() bool {
if !t.IncludeNeeds() {
if !t.IncludeNeeds() && !t.IncludeTransitiveNeeds() {
return t.DiffOptions.SkipNeeds
}

2
pkg/config/lint.go
View File

@ -68,7 +68,7 @@ func (l *LintImpl) IncludeTransitiveNeeds() bool {
// SkipNeeds returns the skip needs
func (l *LintImpl) SkipNeeds() bool {
if !l.IncludeNeeds() {
if !l.IncludeNeeds() && !l.IncludeTransitiveNeeds() {
return l.LintOptions.SkipNeeds
}

2
pkg/config/sync.go
View File

@ -73,7 +73,7 @@ func (t *SyncImpl) Set() []string {
// SkipNeeds returns the skip needs
func (t *SyncImpl) SkipNeeds() bool {
if !t.IncludeNeeds() {
if !t.IncludeNeeds() && !t.IncludeTransitiveNeeds() {
return t.SyncOptions.SkipNeeds
}

2
pkg/config/template.go
View File

@ -99,7 +99,7 @@ func (t *TemplateImpl) SkipCleanup() bool {
// SkipNeeds returns the skip needs
func (t *TemplateImpl) SkipNeeds() bool {
if !t.IncludeNeeds() {
if !t.IncludeNeeds() && !t.IncludeTransitiveNeeds() {
return t.TemplateOptions.SkipNeeds
}