Skip to content

Commit 5efc068

Browse files
authored
Merge pull request #218 from fluxcd/gc-debug
Add debug logs to garbage collection
2 parents b7db5cb + fe3cc52 commit 5efc068

File tree

1 file changed

+17
-6
lines changed

1 file changed

+17
-6
lines changed

controllers/kustomization_gc.go

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package controllers
1919
import (
2020
"context"
2121
"fmt"
22+
"strings"
2223
"time"
2324

2425
"github.com/go-logr/logr"
@@ -71,19 +72,24 @@ func (kgc *KustomizeGarbageCollector) Prune(timeout time.Duration, name string,
7172
if err == nil {
7273
for _, item := range ulist.Items {
7374
if kgc.isStale(item) && item.GetDeletionTimestamp().IsZero() {
74-
name := fmt.Sprintf("%s/%s/%s", item.GetKind(), item.GetNamespace(), item.GetName())
75+
gvkn := fmt.Sprintf("%s/%s/%s", item.GetKind(), item.GetNamespace(), item.GetName())
7576
err = kgc.Delete(ctx, &item)
7677
if err != nil {
77-
outErr += fmt.Sprintf("delete failed for %s: %v\n", name, err)
78+
outErr += fmt.Sprintf("delete failed for %s: %v\n", gvkn, err)
7879
} else {
7980
if len(item.GetFinalizers()) > 0 {
80-
changeSet += fmt.Sprintf("%s marked for deletion\n", name)
81+
changeSet += fmt.Sprintf("%s marked for deletion\n", gvkn)
8182
} else {
82-
changeSet += fmt.Sprintf("%s deleted\n", name)
83+
changeSet += fmt.Sprintf("%s deleted\n", gvkn)
8384
}
8485
}
8586
}
8687
}
88+
} else {
89+
kgc.log.V(1).WithValues(
90+
strings.ToLower(kustomizev1.KustomizationKind),
91+
fmt.Sprintf("%s/%s", namespace, name),
92+
).Info(fmt.Sprintf("gc query failed for %s: %v", gvk.Kind, err))
8793
}
8894
}
8995
}
@@ -100,10 +106,10 @@ func (kgc *KustomizeGarbageCollector) Prune(timeout time.Duration, name string,
100106
if err == nil {
101107
for _, item := range ulist.Items {
102108
if kgc.isStale(item) && item.GetDeletionTimestamp().IsZero() {
103-
name := fmt.Sprintf("%s/%s", item.GetKind(), item.GetName())
109+
gvkn := fmt.Sprintf("%s/%s", item.GetKind(), item.GetName())
104110
err = kgc.Delete(ctx, &item)
105111
if err != nil {
106-
outErr += fmt.Sprintf("delete failed for %s: %v\n", name, err)
112+
outErr += fmt.Sprintf("delete failed for %s: %v\n", gvkn, err)
107113
} else {
108114
if len(item.GetFinalizers()) > 0 {
109115
changeSet += fmt.Sprintf("%s/%s marked for deletion\n", item.GetKind(), item.GetName())
@@ -113,6 +119,11 @@ func (kgc *KustomizeGarbageCollector) Prune(timeout time.Duration, name string,
113119
}
114120
}
115121
}
122+
} else {
123+
kgc.log.V(1).WithValues(
124+
strings.ToLower(kustomizev1.KustomizationKind),
125+
fmt.Sprintf("%s/%s", namespace, name),
126+
).Info(fmt.Sprintf("gc query failed for %s: %v", gvk.Kind, err))
116127
}
117128
}
118129

0 commit comments

Comments
 (0)