Skip to content

fix(mgmt-agent): correctly place podwatcher to always run even if ksm is enabled/disabled #6022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Jul 13, 2026
+6 −9
Merged

fix(mgmt-agent): correctly place podwatcher to always run even if ksm is enabled/disabled #6022

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions mgmt-agent/cmd/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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()
Expand Down