From a607fe798d9ea590d94e52541f2f01623a455c4f Mon Sep 17 00:00:00 2001 From: Federico Gimenez Date: Thu, 30 Nov 2017 08:49:48 +0100 Subject: [PATCH] iinitialize message only when at least one manifest is kept --- pkg/tiller/resource_policy.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/tiller/resource_policy.go b/pkg/tiller/resource_policy.go index fe4684476..66da1283f 100644 --- a/pkg/tiller/resource_policy.go +++ b/pkg/tiller/resource_policy.go @@ -59,7 +59,7 @@ func filterManifestsToKeep(manifests []Manifest) ([]Manifest, []Manifest) { } func summarizeKeptManifests(manifests []Manifest, kubeClient environment.KubeClient, namespace string) string { - message := "These resources were kept due to the resource policy:\n" + var message string for _, m := range manifests { // check if m is in fact present from k8s client's POV. output, err := kubeClient.Get(namespace, bytes.NewBufferString(m.Content)) @@ -68,6 +68,9 @@ func summarizeKeptManifests(manifests []Manifest, kubeClient environment.KubeCli } details := "[" + m.Head.Kind + "] " + m.Head.Metadata.Name + "\n" + if message == "" { + message = "These resources were kept due to the resource policy:\n" + } message = message + details } return message