update garbage collector

docs/rn/0.0.17.md

@@ -2,7 +2,9 @@
 
 [ChangeLog](https://github.com/kform-dev/choreo/releases)
 
-## fix config removal
+## garbage collector
+
+garbage collecor also takes into account deleteTimestamp to identify garbage resources.
 
 ## result command
 

pkg/server/apiserver/registry/delete.go

@@ -49,7 +49,7 @@ func (r *storage) Delete(ctx context.Context, name string, opts ...rest.DeleteOp
 	}
 
 	u := &unstructured.Unstructured{Object: old.UnstructuredContent()}
-	log.Info("delete choreoapiserver", "apiVersion", u.GetAPIVersion(), "kind", u.GetKind(), "name", u.GetName())
+	log.Debug("delete choreoapiserver", "apiVersion", u.GetAPIVersion(), "kind", u.GetKind(), "name", u.GetName())
 
 	oldObjectMeta, err := meta.Accessor(old)
 	if err != nil {

pkg/server/choreo/runner.go

@@ -266,6 +266,7 @@ func (r *run) once(ctx context.Context, bctx *BranchCtx) {
 
 // loads upstream refs, apis, reconcilers, data and garbage collect
 func (r *run) Load(ctx context.Context, branchCtx *BranchCtx) error {
+	log := log.FromContext(ctx)
 	// we only work with checkout branch
 	rootChoreoInstance := r.choreo.GetRootChoreoInstance()
 
@@ -284,7 +285,7 @@ func (r *run) Load(ctx context.Context, branchCtx *BranchCtx) error {
 	rootChoreoInstance.InitAPIs()
 	apis := rootChoreoInstance.GetAPIs()
 	if err := r.loadAPIs(ctx, branchCtx, rootChoreoInstance, apis); err != nil {
-		fmt.Println("apis", err)
+		log.Error("loading apis failed", "error", err)
 		return err
 	}
 
@@ -350,7 +351,7 @@ func (r *run) Load(ctx context.Context, branchCtx *BranchCtx) error {
 		u.SetName(ref.Name)
 		u.SetNamespace(ref.Namespace)
 
-		fmt.Println("delete garbage", u.GetAPIVersion(), u.GetKind(), u.GetName())
+		log.Info("delete garbage resource", "apiVersion", u.GetAPIVersion(), "kind", u.GetKind(), "name", u.GetName())
 
 		if err := r.choreo.GetClient().Delete(ctx, u, &resourceclient.DeleteOptions{
 			Branch: branchCtx.Branch,

pkg/util/inventory/inventory.go

@@ -155,8 +155,8 @@ func (r Inventory) getRoots() []*treeNode {
 func (r Inventory) CollectGarbage() sets.Set[corev1.ObjectReference] {
 	g := newGarbageCollector()
 	for _, node := range r {
-		if node.Resource == nil {
-			fmt.Println("CollectGarbage", node.Resource)
+		if node.Resource == nil || node.Resource.GetDeletionTimestamp() != nil {
+			//fmt.Println("CollectGarbage", node.Resource)
 			g.collect(node)
 		}
 	}