omit "no matches for kind" errors in uninstall as resources that has no kind registered should be considered deleted

Signed-off-by: pepov <peterwilcsinszky@gmail.com>
pull/8151/head
pepov 5 years ago
parent a28d695c43
commit 22a2f7636d

@ -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)

Loading…
Cancel
Save