@@ -318,23 +318,22 @@ func drainOrCordonIfNecessary(interruptionEventStore *interruptioneventstore.Sto
318
318
runPreDrainTask (node , nodeName , drainEvent , metrics , recorder )
319
319
}
320
320
321
+ podNameList , err := node .FetchPodNameList (nodeName )
322
+ if err != nil {
323
+ log .Err (err ).Msgf ("Unable to fetch running pods for node '%s' " , nodeName )
324
+ }
325
+
321
326
if nthConfig .CordonOnly || (drainEvent .IsRebalanceRecommendation () && ! nthConfig .EnableRebalanceDraining ) {
322
327
err = cordonNode (node , nodeName , drainEvent , metrics , recorder )
323
328
} else {
324
329
err = cordonAndDrainNode (node , nodeName , metrics , recorder , nthConfig .EnableSQSTerminationDraining )
325
330
}
326
-
327
- if err != nil {
328
- podNameList , err := node .FetchPodNameList (nodeName )
329
- drainEvent .Pods = podNameList
330
- if err != nil {
331
- log .Err (err ).Msgf ("Unable to fetch running pods for node '%s' " , nodeName )
332
- }
333
- err = node .LogPods (podNameList , nodeName )
334
- if err != nil {
335
- log .Err (err ).Msg ("There was a problem while trying to log all pod names on the node" )
336
- }
337
- }
331
+
332
+ drainEvent .Pods = podNameList
333
+ err = node .LogPods (podNameList , nodeName )
334
+ if err != nil {
335
+ log .Err (err ).Msg ("There was a problem while trying to log all pod names on the node" )
336
+ }
338
337
339
338
interruptionEventStore .MarkAllAsProcessed (nodeName )
340
339
if nthConfig .WebhookURL != "" {
0 commit comments