@@ -63,7 +63,6 @@ type DaemonSetManager struct {
63
63
64
64
resourceClaimTemplateManager * DaemonSetResourceClaimTemplateManager
65
65
cleanupManager * CleanupManager [* appsv1.DaemonSet ]
66
- podManagers map [string ]* DaemonSetPodManager
67
66
}
68
67
69
68
func NewDaemonSetManager (config * ManagerConfig , getComputeDomain GetComputeDomainFunc ) * DaemonSetManager {
@@ -92,7 +91,6 @@ func NewDaemonSetManager(config *ManagerConfig, getComputeDomain GetComputeDomai
92
91
getComputeDomain : getComputeDomain ,
93
92
factory : factory ,
94
93
informer : informer ,
95
- podManagers : make (map [string ]* DaemonSetPodManager ),
96
94
}
97
95
m .resourceClaimTemplateManager = NewDaemonSetResourceClaimTemplateManager (config , getComputeDomain )
98
96
m .cleanupManager = NewCleanupManager [* appsv1.DaemonSet ](informer , getComputeDomain , m .cleanup )
@@ -150,9 +148,6 @@ func (m *DaemonSetManager) Start(ctx context.Context) (rerr error) {
150
148
}
151
149
152
150
func (m * DaemonSetManager ) Stop () error {
153
- if err := m .removeAllPodManagers (); err != nil {
154
- return fmt .Errorf ("error removing all Pod managers: %w" , err )
155
- }
156
151
if err := m .resourceClaimTemplateManager .Stop (); err != nil {
157
152
return fmt .Errorf ("error stopping ResourceClaimTemplate manager: %w" , err )
158
153
}
@@ -230,16 +225,11 @@ func (m *DaemonSetManager) Delete(ctx context.Context, cdUID string) error {
230
225
}
231
226
232
227
d := ds [0 ]
233
- key := d .Spec .Selector .MatchLabels [computeDomainLabelKey ]
234
228
235
229
if err := m .resourceClaimTemplateManager .Delete (ctx , cdUID ); err != nil {
236
230
return fmt .Errorf ("error deleting ResourceClaimTemplate: %w" , err )
237
231
}
238
232
239
- if err := m .removePodManager (key ); err != nil {
240
- return fmt .Errorf ("error removing Pod manager: %w" , err )
241
- }
242
-
243
233
if d .GetDeletionTimestamp () != nil {
244
234
return nil
245
235
}
@@ -335,10 +325,6 @@ func (m *DaemonSetManager) onAddOrUpdate(ctx context.Context, obj any) error {
335
325
return nil
336
326
}
337
327
338
- if err := m .addPodManager (ctx , d .Spec .Selector , cd .Spec .NumNodes ); err != nil {
339
- return fmt .Errorf ("error adding Pod manager '%s/%s': %w" , d .Namespace , d .Name , err )
340
- }
341
-
342
328
if int (d .Status .NumberReady ) != cd .Spec .NumNodes {
343
329
return nil
344
330
}
@@ -352,60 +338,6 @@ func (m *DaemonSetManager) onAddOrUpdate(ctx context.Context, obj any) error {
352
338
return nil
353
339
}
354
340
355
- func (m * DaemonSetManager ) addPodManager (ctx context.Context , labelSelector * metav1.LabelSelector , numPods int ) error {
356
- key := labelSelector .MatchLabels [computeDomainLabelKey ]
357
-
358
- if _ , exists := m .podManagers [key ]; exists {
359
- return nil
360
- }
361
-
362
- podManager := NewDaemonSetPodManager (m .config , labelSelector , numPods , m .getComputeDomain )
363
-
364
- if err := podManager .Start (ctx ); err != nil {
365
- return fmt .Errorf ("error creating Pod manager: %w" , err )
366
- }
367
-
368
- m .Lock ()
369
- m .podManagers [key ] = podManager
370
- m .Unlock ()
371
-
372
- return nil
373
- }
374
-
375
- func (m * DaemonSetManager ) removePodManager (key string ) error {
376
- if _ , exists := m .podManagers [key ]; ! exists {
377
- return nil
378
- }
379
-
380
- m .Lock ()
381
- podManager := m .podManagers [key ]
382
- m .Unlock ()
383
-
384
- if err := podManager .Stop (); err != nil {
385
- return fmt .Errorf ("error stopping Pod manager: %w" , err )
386
- }
387
-
388
- m .Lock ()
389
- delete (m .podManagers , key )
390
- m .Unlock ()
391
-
392
- return nil
393
- }
394
-
395
- func (m * DaemonSetManager ) removeAllPodManagers () error {
396
- m .Lock ()
397
- for key , pm := range m .podManagers {
398
- m .Unlock ()
399
- if err := pm .Stop (); err != nil {
400
- return fmt .Errorf ("error stopping Pod manager: %w" , err )
401
- }
402
- m .Lock ()
403
- delete (m .podManagers , key )
404
- }
405
- m .Unlock ()
406
- return nil
407
- }
408
-
409
341
func (m * DaemonSetManager ) cleanup (ctx context.Context , cdUID string ) error {
410
342
if err := m .Delete (ctx , cdUID ); err != nil {
411
343
return fmt .Errorf ("error deleting DaemonSet: %w" , err )
0 commit comments