From cbec9efaf1bc5600eedbdf3fd3c4188827b3ea80 Mon Sep 17 00:00:00 2001
From: Ben Vesel <10840174+bennerv@users.noreply.github.com>
Date: Fri, 10 Jul 2026 17:46:53 -0400
Subject: [PATCH] fix(mgmt-agent): correctly place podwatcher to always run
 regardless if ksm is enabled

---
 mgmt-agent/cmd/options.go | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/mgmt-agent/cmd/options.go b/mgmt-agent/cmd/options.go
index be82bd6cfa4..1d210c4ea8b 100644
--- a/mgmt-agent/cmd/options.go
+++ b/mgmt-agent/cmd/options.go
@@ -170,11 +170,15 @@ func (o *ValidatedControllerOptions) Complete(ctx context.Context) (*ControllerO
 
 	resourceWatcher := controller.NewResourceWatcher(dynamicClient, discoveryClient)
 
+	clusterWideKubeInformers := kubeinformers.NewSharedInformerFactory(kubeClientset, 0)
+	podWatcher, err := controller.NewPodWatcher(clusterWideKubeInformers.Core().V1().Pods())
+	if err != nil {
+		return nil, fmt.Errorf("failed to create pod watcher: %w", err)
+	}
+
 	var ksmCtrl *ksmhcp.KSMHCPController
-	var podWatcher *controller.PodWatcher
 	var hsInformers hypershiftinformers.SharedInformerFactory
 	var ksmKubeInformers kubeinformers.SharedInformerFactory
-	var clusterWideKubeInformers kubeinformers.SharedInformerFactory
 	var dynInformers dynamicinformer.DynamicSharedInformerFactory
 	if o.KSMImage != "" {
 		hsClient, err := hypershiftclient.NewForConfig(kubeConfig)
@@ -205,13 +209,6 @@ func (o *ValidatedControllerOptions) Complete(ctx context.Context) (*ControllerO
 		if err != nil {
 			return nil, fmt.Errorf("failed to create KSM HCP controller: %w", err)
 		}
-
-		clusterWideKubeInformers = kubeinformers.NewSharedInformerFactory(kubeClientset, 0)
-
-		podWatcher, err = controller.NewPodWatcher(clusterWideKubeInformers.Core().V1().Pods())
-		if err != nil {
-			return nil, fmt.Errorf("failed to create pod watcher: %w", err)
-		}
 	}
 
 	hostname, err := os.Hostname()