Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion pkg/skaffold/deploy/helm/helm.go
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,10 @@ func (h *Deployer) Cleanup(ctx context.Context, out io.Writer, dryRun bool, _ ma
})

var errMsgs []string
for _, r := range h.Releases {
// Iterate releases in reverse order so that dependent releases are removed
// before their dependencies (mirrors the install order).
for i := len(h.Releases) - 1; i >= 0; i-- {
r := h.Releases[i]
releaseName, err := util.ExpandEnvTemplateOrFail(r.Name, nil)
if err != nil {
return fmt.Errorf("cannot parse the release name template: %w", err)
Expand Down
19 changes: 19 additions & 0 deletions pkg/skaffold/deploy/helm/helm_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1302,6 +1302,25 @@ func TestHelmCleanup(t *testing.T) {
namespace: kubectl.TestNamespace,
builds: testBuilds,
},
{
description: "helm3 cleanup releases in reverse order",
commands: testutil.
CmdRunWithOutput("helm version", version31).
AndRun("helm --kube-context kubecontext delete E --kubeconfig kubeconfig").
AndRun("helm --kube-context kubecontext delete D --kubeconfig kubeconfig").
AndRun("helm --kube-context kubecontext delete C --kubeconfig kubeconfig").
AndRun("helm --kube-context kubecontext delete B --kubeconfig kubeconfig").
AndRun("helm --kube-context kubecontext delete A --kubeconfig kubeconfig"),
helm: latest.LegacyHelmDeploy{
Releases: []latest.HelmRelease{
{Name: "A", ChartPath: "examples/test"},
{Name: "B", ChartPath: "examples/test"},
{Name: "C", ChartPath: "examples/test"},
{Name: "D", ChartPath: "examples/test"},
{Name: "E", ChartPath: "examples/test"},
},
},
},
}
for _, test := range tests {
testutil.Run(t, test.description, func(t *testutil.T) {
Expand Down