From 9f86ea40b87e55c570d1d4008d5aee6e0f71998b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 25 Apr 2026 00:56:34 +0000 Subject: [PATCH] Return early with combined error when uninstall fails in UpdatePlugin fallback Agent-Logs-Url: https://github.com/helmfile/helmfile/sessions/bb9a675c-309d-4b06-83d4-a6fe078dce64 Co-authored-by: yxxhero <11087727+yxxhero@users.noreply.github.com> --- pkg/helmexec/exec.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/helmexec/exec.go b/pkg/helmexec/exec.go index ee8cdad1..cdfa90a8 100644 --- a/pkg/helmexec/exec.go +++ b/pkg/helmexec/exec.go @@ -951,7 +951,7 @@ func (helm *execer) UpdatePlugin(name, repo, version string) error { updateErr := err helm.logger.Infof("helm plugin update %v failed (%v), falling back to reinstall with version %v", name, updateErr, version) if uninstallErr := helm.uninstallPlugin(name); uninstallErr != nil { - helm.logger.Warnf("Failed to uninstall helm plugin %v: %v", name, uninstallErr) + return fmt.Errorf("helm plugin update failed (%w) and uninstall for reinstall also failed: %w", updateErr, uninstallErr) } if reinstallErr := helm.AddPlugin(name, repo, version); reinstallErr != nil { return fmt.Errorf("helm plugin update failed (%w) and reinstall also failed: %w", updateErr, reinstallErr)