@@ -41,8 +41,6 @@ type DaemonSetPodManager struct {
4141 lister corev1listers.PodLister
4242
4343 getComputeDomain GetComputeDomainFunc
44-
45- cleanupManager * CleanupManager [* corev1.Pod ]
4644}
4745
4846func NewDaemonSetPodManager (config * ManagerConfig , getComputeDomain GetComputeDomainFunc ) * DaemonSetPodManager {
@@ -75,8 +73,6 @@ func NewDaemonSetPodManager(config *ManagerConfig, getComputeDomain GetComputeDo
7573 getComputeDomain : getComputeDomain ,
7674 }
7775
78- m .cleanupManager = NewCleanupManager [* corev1.Pod ](informer , getComputeDomain , m .cleanup )
79-
8076 return m
8177}
8278
@@ -131,66 +127,17 @@ func (m *DaemonSetPodManager) Start(ctx context.Context) (rerr error) {
131127 return fmt .Errorf ("error syncing pod informer: %w" , err )
132128 }
133129
134- if err := m .cleanupManager .Start (ctx ); err != nil {
135- return fmt .Errorf ("error starting cleanup manager: %w" , err )
136- }
137-
138130 return nil
139131}
140132
141133func (m * DaemonSetPodManager ) Stop () error {
142- if err := m .cleanupManager .Stop (); err != nil {
143- return fmt .Errorf ("error stopping cleanup manager: %w" , err )
144- }
145134 if m .cancelContext != nil {
146135 m .cancelContext ()
147136 }
148137 m .waitGroup .Wait ()
149138 return nil
150139}
151140
152- // cleanup removes nodes from the ComputeDomain status that no longer have backing pods.
153- func (m * DaemonSetPodManager ) cleanup (ctx context.Context , cdUID string ) error {
154- cd , err := m .getComputeDomain (cdUID )
155- if err != nil {
156- return fmt .Errorf ("error getting ComputeDomain: %w" , err )
157- }
158- if cd == nil {
159- return nil
160- }
161-
162- pods , err := m .lister .List (nil )
163- if err != nil {
164- return fmt .Errorf ("error listing pods: %w" , err )
165- }
166-
167- newCD := cd .DeepCopy ()
168-
169- // Create a set of pod IPs for efficient lookup
170- podIPs := make (map [string ]struct {})
171- for _ , pod := range pods {
172- if pod .Status .PodIP != "" {
173- podIPs [pod .Status .PodIP ] = struct {}{}
174- }
175- }
176-
177- // Check if any nodes in the ComputeDomain status don't have backing pods
178- var updatedNodes []* nvapi.ComputeDomainNode
179- for _ , node := range newCD .Status .Nodes {
180- if _ , exists := podIPs [node .IPAddress ]; exists {
181- updatedNodes = append (updatedNodes , node )
182- }
183- }
184-
185- // Update the ComputeDomain status
186- if err := m .updateComputeDomainNodes (ctx , newCD , updatedNodes ); err != nil {
187- return fmt .Errorf ("error updating ComputeDomain status after removing stale nodes: %w" , err )
188- }
189-
190- klog .Infof ("Successfully cleaned up stale nodes from ComputeDomain %s/%s" , cd .Namespace , cd .Name )
191- return nil
192- }
193-
194141func (m * DaemonSetPodManager ) onPodDelete (ctx context.Context , obj any ) error {
195142 p , ok := obj .(* corev1.Pod )
196143 if ! ok {
0 commit comments