diff --git a/changelog/fragments/helm-uninstall-fix.yaml b/changelog/fragments/helm-uninstall-fix.yaml new file mode 100644 index 0000000000..e8b6ce8851 --- /dev/null +++ b/changelog/fragments/helm-uninstall-fix.yaml @@ -0,0 +1,4 @@ +entries: + - description: Fixed a bug that caused the Helm operator to remove the finalizer without doing a helm uninstall. + kind: "bugfix" + breaking: false \ No newline at end of file diff --git a/internal/helm/release/manager.go b/internal/helm/release/manager.go index d72c2a0c0c..c2968e4ddf 100644 --- a/internal/helm/release/manager.go +++ b/internal/helm/release/manager.go @@ -351,18 +351,6 @@ func createJSONMergePatch(existingJSON, expectedJSON []byte) ([]byte, error) { // UninstallRelease performs a Helm release uninstall. func (m manager) UninstallRelease(ctx context.Context, opts ...UninstallOption) (*rpb.Release, error) { - // Get history of this release - h, err := m.storageBackend.History(m.releaseName) - if err != nil { - return nil, fmt.Errorf("failed to get release history: %w", err) - } - - // If there is no history, the release has already been uninstalled, - // so return ErrReleaseNotFound. - if len(h) == 0 { - return nil, driver.ErrReleaseNotFound - } - uninstall := action.NewUninstall(m.actionConfig) for _, o := range opts { if err := o(uninstall); err != nil {