diff --git a/pkg/tiller/release_modules.go b/pkg/tiller/release_modules.go index 57b8c4fee..876e1ba37 100644 --- a/pkg/tiller/release_modules.go +++ b/pkg/tiller/release_modules.go @@ -159,9 +159,9 @@ func DeleteRelease(rel *release.Release, vs chartutil.VersionSet, kubeClient env return rel.Manifest, []error{fmt.Errorf("corrupted release record. You must manually delete the resources: %s", err)} } - filesToKeep, filesToDelete := filterManifestsToKeep(files, kubeClient, rel.Namespace) + filesToKeep, filesToDelete := filterManifestsToKeep(files) if len(filesToKeep) > 0 { - kept = summarizeKeptManifests(filesToKeep) + kept = summarizeKeptManifests(filesToKeep, kubeClient, rel.Namespace) } errs = []error{} diff --git a/pkg/tiller/resource_policy.go b/pkg/tiller/resource_policy.go index bc92f706a..fe4684476 100644 --- a/pkg/tiller/resource_policy.go +++ b/pkg/tiller/resource_policy.go @@ -33,7 +33,7 @@ const resourcePolicyAnno = "helm.sh/resource-policy" // during an uninstallRelease action. const keepPolicy = "keep" -func filterManifestsToKeep(manifests []Manifest, kubeClient environment.KubeClient, namespace string) ([]Manifest, []Manifest) { +func filterManifestsToKeep(manifests []Manifest) ([]Manifest, []Manifest) { remaining := []Manifest{} keep := []Manifest{} @@ -58,7 +58,7 @@ func filterManifestsToKeep(manifests []Manifest, kubeClient environment.KubeClie return keep, remaining } -func summarizeKeptManifests(manifests []Manifest) string { +func summarizeKeptManifests(manifests []Manifest, kubeClient environment.KubeClient, namespace string) string { message := "These resources were kept due to the resource policy:\n" for _, m := range manifests { // check if m is in fact present from k8s client's POV.