From 472f8b2628770ec8c3cdb41f590e9937f5c7dede Mon Sep 17 00:00:00 2001 From: Rachel Weber Date: Thu, 25 Sep 2025 18:09:12 -0700 Subject: [PATCH] Fixing rollback and uninstall client WaitStrategy. Signed-off-by: Rachel Weber --- pkg/action/install.go | 1 + pkg/action/rollback.go | 2 +- pkg/action/upgrade.go | 4 +--- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/action/install.go b/pkg/action/install.go index c6d4f723c..4321877b5 100644 --- a/pkg/action/install.go +++ b/pkg/action/install.go @@ -566,6 +566,7 @@ func (i *Install) failRelease(rel *release.Release, err error) (*release.Release uninstall.DisableHooks = i.DisableHooks uninstall.KeepHistory = false uninstall.Timeout = i.Timeout + uninstall.WaitStrategy = i.WaitStrategy if _, uninstallErr := uninstall.Run(i.ReleaseName); uninstallErr != nil { return rel, fmt.Errorf("an error occurred while uninstalling the release. original install error: %w: %w", err, uninstallErr) } diff --git a/pkg/action/rollback.go b/pkg/action/rollback.go index f56052988..7e32e6f44 100644 --- a/pkg/action/rollback.go +++ b/pkg/action/rollback.go @@ -235,7 +235,7 @@ func (r *Rollback) performRollback(currentRelease, targetRelease *release.Releas waiter, err := r.cfg.KubeClient.GetWaiter(r.WaitStrategy) if err != nil { - return nil, fmt.Errorf("unable to set metadata visitor from target release: %w", err) + return nil, fmt.Errorf("unable to get waiter: %w", err) } if r.WaitForJobs { if err := waiter.WaitWithJobs(target, r.Timeout); err != nil { diff --git a/pkg/action/upgrade.go b/pkg/action/upgrade.go index 3c84570b2..e31f13b9b 100644 --- a/pkg/action/upgrade.go +++ b/pkg/action/upgrade.go @@ -563,9 +563,7 @@ func (u *Upgrade) failRelease(rel *release.Release, created kube.ResourceList, e rollin := NewRollback(u.cfg) rollin.Version = filteredHistory[0].Version - if u.WaitStrategy == kube.HookOnlyStrategy { - rollin.WaitStrategy = kube.StatusWatcherStrategy - } + rollin.WaitStrategy = u.WaitStrategy rollin.WaitForJobs = u.WaitForJobs rollin.DisableHooks = u.DisableHooks rollin.ForceReplace = u.ForceReplace