Skip to content

Commit

Permalink
Fix unintended name shadowing
Browse files Browse the repository at this point in the history
  • Loading branch information
trk9001 committed Jul 31, 2024
1 parent 9de7673 commit 40e8e3a
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions cmd/helm3.go
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,12 @@ func (d *diffCmd) template(isUpgrade bool) ([]byte, error) {
}()
// In the presence of --reuse-values (or --reset-values), --reset-then-reuse-values is ignored.
if d.resetThenReuseValues && !d.reuseValues {
resetThenReuseValuesIsSupported, err := isHelmVersionAtLeast(minHelmVersionWithResetThenReuseValues)
var supported bool
supported, err = isHelmVersionAtLeast(minHelmVersionWithResetThenReuseValues)
if err != nil {
return nil, err
}
if !resetThenReuseValuesIsSupported {
if !supported {
return nil, fmt.Errorf("Using --reset-then-reuse-values requires at least helm version %s", minHelmVersionWithResetThenReuseValues.String())
}
err = d.writeExistingValues(tmpfile, false)
Expand Down

0 comments on commit 40e8e3a

Please sign in to comment.