From 22a2f7636d83d87d2f23abfaf21c59d7aa28a1c8 Mon Sep 17 00:00:00 2001 From: pepov Date: Sat, 16 May 2020 22:32:56 +0200 Subject: [PATCH] omit "no matches for kind" errors in uninstall as resources that has no kind registered should be considered deleted Signed-off-by: pepov --- pkg/action/uninstall.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/action/uninstall.go b/pkg/action/uninstall.go index a51a283d6..125b36d60 100644 --- a/pkg/action/uninstall.go +++ b/pkg/action/uninstall.go @@ -21,6 +21,7 @@ import ( "time" "github.com/pkg/errors" + k8serrors "k8s.io/apimachinery/pkg/util/errors" "helm.sh/helm/v3/pkg/release" "helm.sh/helm/v3/pkg/releaseutil" @@ -198,7 +199,12 @@ func (u *Uninstall) deleteRelease(rel *release.Release) (string, []error) { resources, err := u.cfg.KubeClient.Build(strings.NewReader(builder.String()), false) if err != nil { - return "", []error{errors.Wrap(err, "unable to build kubernetes objects for delete")} + remainingErr := k8serrors.FilterOut(err, func(err error) bool { + return strings.Contains(err.Error(), "no matches for kind") + }) + if remainingErr != nil { + return "", []error{errors.Wrap(remainingErr, "unable to build kubernetes objects for delete")} + } } if len(resources) > 0 { _, errs = u.cfg.KubeClient.Delete(resources)