Merge pull request kubernetes-sigs#11336 from Karthik-K-N/remove-clus…

…tercache-check 🌱 Remove clustercache nil checks
sbueringer · Oct 25, 2024 · 7957510 · 7957510
2 parents e5cbc4a + 43f1ee5
commit 7957510
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/internal/controllers/machine/machine_controller.go b/internal/controllers/machine/machine_controller.go
@@ -1045,11 +1045,6 @@ func (r *Reconciler) watchClusterNodes(ctx context.Context, cluster *clusterv1.C
 		return nil
 	}
 
-	// If there is no tracker, don't watch remote nodes
-	if r.ClusterCache == nil {
-		return nil
-	}
-
 	return r.ClusterCache.Watch(ctx, util.ObjectKey(cluster), clustercache.WatchInput{
 		Name:         "machine-watchNodes",
 		Watcher:      r.controller,

diff --git a/internal/controllers/machinehealthcheck/machinehealthcheck_controller.go b/internal/controllers/machinehealthcheck/machinehealthcheck_controller.go
@@ -572,11 +572,6 @@ func (r *Reconciler) nodeToMachineHealthCheck(ctx context.Context, o client.Obje
 }
 
 func (r *Reconciler) watchClusterNodes(ctx context.Context, cluster *clusterv1.Cluster) error {
-	// If there is no tracker, don't watch remote nodes
-	if r.ClusterCache == nil {
-		return nil
-	}
-
 	return r.ClusterCache.Watch(ctx, util.ObjectKey(cluster), clustercache.WatchInput{
 		Name:         "machinehealthcheck-watchClusterNodes",
 		Watcher:      r.controller,