fix: move warning to top of block

Emit the warning first to ensure it's always logged. This clarifies that any following errors are due to using a local chart instead of a remote repository.

Signed-off-by: Feng Cao <24779889+shfc@users.noreply.github.com>
pull/30852/head
Feng Cao 5 months ago
parent 6b5c94475d
commit eb5b6d5047

@ -751,6 +751,12 @@ func (c *ChartPathOptions) LocateChart(name string, settings *cli.EnvSettings) (
version := strings.TrimSpace(c.Version) version := strings.TrimSpace(c.Version)
if _, err := os.Stat(name); err == nil { if _, err := os.Stat(name); err == nil {
// Issue #7862: Helm prioritizes local charts over --repo flag.
// This behavior is maintained for backwards compatibility but with a warning.
if c.RepoURL != "" {
slog.Warn("local chart found in current working directory. --repo flag ignored", "chart", name)
}
abs, err := filepath.Abs(name) abs, err := filepath.Abs(name)
if err != nil { if err != nil {
return abs, err return abs, err
@ -760,11 +766,6 @@ func (c *ChartPathOptions) LocateChart(name string, settings *cli.EnvSettings) (
return "", err return "", err
} }
} }
// Issue #7862: Helm prioritizes local charts over --repo flag.
// This behavior is maintained for backwards compatibility but with a warning.
if c.RepoURL != "" {
slog.Warn("local chart found in current working directory. --repo flag ignored", "chart", name)
}
return abs, nil return abs, nil
} }
if filepath.IsAbs(name) || strings.HasPrefix(name, ".") { if filepath.IsAbs(name) || strings.HasPrefix(name, ".") {

Loading…
Cancel
Save