From 81eaf2f2636cc6eadb29d0fea71fd85d22812c97 Mon Sep 17 00:00:00 2001
From: Federico Gimenez <federico@giantswarm.io>
Date: Wed, 29 Nov 2017 14:14:50 +0100
Subject: [PATCH] only check existence for the possibly kept manifests
---
pkg/tiller/resource_policy.go | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkg/tiller/resource_policy.go b/pkg/tiller/resource_policy.go
index e4e08d435..bc92f706a 100644
--- a/pkg/tiller/resource_policy.go
+++ b/pkg/tiller/resource_policy.go
@@ -38,12 +38,6 @@ func filterManifestsToKeep(manifests []Manifest, kubeClient environment.KubeClie
keep := []Manifest{}
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))
- if err != nil || strings.Contains(output, kube.MissingGetHeader) {
- continue
- }
-
if m.Head.Metadata == nil || m.Head.Metadata.Annotations == nil || len(m.Head.Metadata.Annotations) == 0 {
remaining = append(remaining, m)
continue
@@ -67,6 +61,12 @@ func filterManifestsToKeep(manifests []Manifest, kubeClient environment.KubeClie
func summarizeKeptManifests(manifests []Manifest) 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.
+ output, err := kubeClient.Get(namespace, bytes.NewBufferString(m.Content))
+ if err != nil || strings.Contains(output, kube.MissingGetHeader) {
+ continue
+ }
+
details := "[" + m.Head.Kind + "] " + m.Head.Metadata.Name + "\n"
message = message + details
}
--
GitLab