fix signatures

pull/3131/head
Federico Gimenez 7 years ago
parent 81eaf2f263
commit 93bce130fb

@ -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)} 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 { if len(filesToKeep) > 0 {
kept = summarizeKeptManifests(filesToKeep) kept = summarizeKeptManifests(filesToKeep, kubeClient, rel.Namespace)
} }
errs = []error{} errs = []error{}

@ -33,7 +33,7 @@ const resourcePolicyAnno = "helm.sh/resource-policy"
// during an uninstallRelease action. // during an uninstallRelease action.
const keepPolicy = "keep" const keepPolicy = "keep"
func filterManifestsToKeep(manifests []Manifest, kubeClient environment.KubeClient, namespace string) ([]Manifest, []Manifest) { func filterManifestsToKeep(manifests []Manifest) ([]Manifest, []Manifest) {
remaining := []Manifest{} remaining := []Manifest{}
keep := []Manifest{} keep := []Manifest{}
@ -58,7 +58,7 @@ func filterManifestsToKeep(manifests []Manifest, kubeClient environment.KubeClie
return keep, remaining 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" message := "These resources were kept due to the resource policy:\n"
for _, m := range manifests { for _, m := range manifests {
// check if m is in fact present from k8s client's POV. // check if m is in fact present from k8s client's POV.

Loading…
Cancel
Save