upstream/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-04-21 14:17:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #31648 from hiddeco/backport-12564-to-dev-v3
Some checks failed
build-test / build (push) Has been cancelled
Details
CodeQL / Analyze (push) Has been cancelled
Details
golangci-lint / golangci-lint (push) Has been cancelled
Details

Browse source 
[v3 backport] fix(uninstall): supersede deployed releases
This commit is contained in:
George Jenkins 2025-12-26 08:21:57 -08:00 committed by GitHub
commit 0bfd2cbe75
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmd/helm/testdata/output/uninstall-keep-history-earlier-deployed.txt vendored Normal file
View file

@ -0,0 +1 @@
release "aeneas" uninstalled

9
cmd/helm/uninstall_test.go
View file

@ -57,6 +57,15 @@ func TestUninstall(t *testing.T) {
golden: "output/uninstall-keep-history.txt",
rels: []*release.Release{release.Mock(&release.MockReleaseOptions{Name: "aeneas"})},
},
{
name: "keep history with earlier deployed release",
cmd: "uninstall aeneas --keep-history",
golden: "output/uninstall-keep-history-earlier-deployed.txt",
rels: []*release.Release{
release.Mock(&release.MockReleaseOptions{Name: "aeneas", Version: 1, Status: release.StatusDeployed}),
release.Mock(&release.MockReleaseOptions{Name: "aeneas", Version: 2, Status: release.StatusFailed}),
},
},
{
name: "wait",
cmd: "uninstall aeneas --wait",

3
pkg/action/rollback.go
View file

@ -26,6 +26,7 @@ import (
"helm.sh/helm/v3/pkg/chartutil"
"helm.sh/helm/v3/pkg/release"
"helm.sh/helm/v3/pkg/storage/driver"
helmtime "helm.sh/helm/v3/pkg/time"
)
@ -249,7 +250,7 @@ func (r *Rollback) performRollback(currentRelease, targetRelease *release.Releas
}
deployed, err := r.cfg.Releases.DeployedAll(currentRelease.Name)
if err != nil && !strings.Contains(err.Error(), "has no deployed releases") {
if err != nil && !errors.Is(err, driver.ErrNoDeployedReleases) {
return nil, err
}
// Supersede all previous deployments, see issue #2941.

14
pkg/action/uninstall.go
View file

@ -28,6 +28,7 @@ import (
"helm.sh/helm/v3/pkg/kube"
"helm.sh/helm/v3/pkg/release"
"helm.sh/helm/v3/pkg/releaseutil"
"helm.sh/helm/v3/pkg/storage/driver"
helmtime "helm.sh/helm/v3/pkg/time"
)
@ -170,6 +171,19 @@ func (u *Uninstall) Run(name string) (*release.UninstallReleaseResponse, error)
u.cfg.Log("uninstall: Failed to store updated release: %s", err)
}
// Supersede all previous deployments, see issue #12556 (which is a
// variation on #2941).
deployed, err := u.cfg.Releases.DeployedAll(name)
if err != nil && !errors.Is(err, driver.ErrNoDeployedReleases) {
return nil, err
}
for _, reli := range deployed {
reli.Info.Status = release.StatusSuperseded
if err = u.cfg.Releases.Update(reli); err != nil {
u.cfg.Log("uninstall: Failed to store updated release: %s", err)
}
}
if len(errs) > 0 {
return res, errors.Errorf("uninstallation completed with %d error(s): %s", len(errs), joinErrors(errs))
}