fix: Reverted the removal of the lifecycle hook completion

stevehipwell · stevehipwell · commit d67783cba07f · 2024-05-10T07:19:51.000+01:00
Signed-off-by: Steve Hipwell &lt;steve.hipwell@gmail.com&gt;
diff --git a/pkg/monitor/sqsevent/asg-lifecycle-event.go b/pkg/monitor/sqsevent/asg-lifecycle-event.go
@@ -95,6 +95,11 @@ func (m SQSMonitor) asgTerminationToInterruptionEvent(event *EventBridgeEvent, m
 	}
 
 	interruptionEvent.PostDrainTask = func(interruptionEvent monitor.InterruptionEvent, _ node.Node) error {
+		_, err = m.continueLifecycleAction(lifecycleDetail)
+		if err != nil {
+			return fmt.Errorf("continuing ASG termination lifecycle: %w", err)
+		}
+		log.Info().Str("lifecycleHookName", lifecycleDetail.LifecycleHookName).Str("instanceID", lifecycleDetail.EC2InstanceID).Msg("Completed ASG Lifecycle Hook")
 		return m.deleteMessage(message)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,11 @@ func (m SQSMonitor) asgTerminationToInterruptionEvent(event *EventBridgeEvent, m`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`interruptionEvent.PostDrainTask = func(interruptionEvent monitor.InterruptionEvent, _ node.Node) error {`
	`98`	`+ _, err = m.continueLifecycleAction(lifecycleDetail)`
	`99`	`+ if err != nil {`
	`100`	`+ return fmt.Errorf("continuing ASG termination lifecycle: %w", err)`
	`101`	`+ }`
	`102`	`+ log.Info().Str("lifecycleHookName", lifecycleDetail.LifecycleHookName).Str("instanceID", lifecycleDetail.EC2InstanceID).Msg("Completed ASG Lifecycle Hook")`
`98`	`103`	`return m.deleteMessage(message)`
`99`	`104`	`}`
`100`	`105`