Skip to content

Commit d093be9

Browse files
author
Abhay Verma
committed
fixes aws#423: Populate pod list in webhook notification
1 parent a0f05f0 commit d093be9

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

cmd/node-termination-handler.go

+11-12
Original file line numberDiff line numberDiff line change
@@ -318,23 +318,22 @@ func drainOrCordonIfNecessary(interruptionEventStore *interruptioneventstore.Sto
318318
runPreDrainTask(node, nodeName, drainEvent, metrics, recorder)
319319
}
320320

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+
321326
if nthConfig.CordonOnly || (drainEvent.IsRebalanceRecommendation() && !nthConfig.EnableRebalanceDraining) {
322327
err = cordonNode(node, nodeName, drainEvent, metrics, recorder)
323328
} else {
324329
err = cordonAndDrainNode(node, nodeName, metrics, recorder, nthConfig.EnableSQSTerminationDraining)
325330
}
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+
}
338337

339338
interruptionEventStore.MarkAllAsProcessed(nodeName)
340339
if nthConfig.WebhookURL != "" {

0 commit comments

Comments
 (0)