todo: rework resource watcher

Author: PatrickLaabs

controllers/cdk8sappproxy/cdk8sappproxy_controller.go

@@ -144,7 +144,7 @@ func getPluralFromKind(kind string) string {
 // SetupWithManager sets up the controller with the Manager.
 func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
 	// Initialize the new simplified watch system
-	r.WatchManager = NewResourceWatchManager(mgr.GetClient(), r.Reconcile)
+	r.WatchManager = NewResourceWatchManager(mgr.GetClient())
 
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&addonsv1alpha1.Cdk8sAppProxy{}).

controllers/cdk8sappproxy/cdk8sappproxy_resourcewatcher.go

@@ -3,14 +3,12 @@ package cdk8sappproxy
 import (
 	"context"
 	"sync"
-	"time"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/dynamic"
-	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
@@ -20,7 +18,6 @@ type ResourceWatchManager struct {
 	mu      sync.RWMutex
 	watches map[types.NamespacedName]map[string]context.CancelFunc
 	client  client.Client
-	queue   workqueue.RateLimitingInterface
 }
 
 // WatchInfo holds information about an active watch
@@ -33,11 +30,10 @@ type WatchInfo struct {
 }
 
 // NewResourceWatchManager creates a new resource watch manager.
-func NewResourceWatchManager(client client.Client, reconcileFunc func(context.Context, ctrl.Request) (ctrl.Result, error)) *ResourceWatchManager {
+func NewResourceWatchManager(client client.Client) *ResourceWatchManager {
 	return &ResourceWatchManager{
 		watches: make(map[types.NamespacedName]map[string]context.CancelFunc),
 		client:  client,
-		queue:   workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "resource-deletion"),
 	}
 }
 
@@ -155,21 +151,6 @@ func (m *ResourceWatchManager) watchResource(ctx context.Context, targetClient d
 func (m *ResourceWatchManager) triggerReconciliation(ctx context.Context, parentProxy types.NamespacedName) error {
 	logger := log.FromContext(ctx).WithValues("parentProxy", parentProxy.String())
 
-	if m.reconcileFunc != nil {
-		req := ctrl.Request{NamespacedName: parentProxy}
-		go func() {
-			reconcileCtx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-			defer cancel()
-
-			_, err := m.reconcileFunc(reconcileCtx, req)
-			if err != nil {
-				logger.Error(err, "Failed to reconcile after resource deletion")
-			} else {
-				logger.Info("Successfully triggered reconciliation after resource deletion")
-			}
-		}()
-	}
-
 	logger.Info("Resource deletion detected, reconciliation triggered")
 
 	return nil