Skip to content

Commit 88a1c54

Browse files
authored
Reduce heartbeat timeout for ASG lifecycle hooks to from 30 minutes to 3 minutes since aws-node-termination-handler-app (NTH) can now send heartbeats (#1485)
1 parent 330b608 commit 88a1c54

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1313
- The container registry passed as value to default apps is set to `gsoci.azurecr.io`, regardless of the cluster region. The mirroring feature of `containerd` will make sure the right registry is used.
1414
- Switch to HelmReleases to install `karpenter` and `karpenter-crossplane-resources` charts.
1515
- Bump flux `HelmReleases` api version to v2.
16+
- Reduce heartbeat timeout for ASG lifecycle hooks to from 30 minutes to 3 minutes since aws-node-termination-handler-app (NTH) can now send heartbeats
1617

1718
### Removed
1819

helm/cluster-aws/templates/_machine_pools.tpl

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,11 @@ spec:
112112
- defaultResult: CONTINUE
113113

114114
{{/*
115-
The default is a high enough heartbeat timeout because aws-node-termination-handler (shortened to "NTH" here)
116-
doesn't send heartbeats (https://github.com/aws/aws-node-termination-handler/issues/493),
117-
but low enough so that if the controller is down, instances can still terminate within
118-
a reasonable time.
115+
Since aws-node-termination-handler-app (shortened to "NTH" here) was improved to send
116+
heartbeats, this can be a low value. If NTH is down or cannot send heartbeats, this allows
117+
instances to be terminated in a reasonable time - for example during cluster deletion.
119118
*/}}
120-
heartbeatTimeout: "{{ ($value.awsNodeTerminationHandler).heartbeatTimeoutSeconds | default 1800 }}s"
119+
heartbeatTimeout: "{{ ($value.awsNodeTerminationHandler).heartbeatTimeoutSeconds | default 180 }}s"
121120

122121
lifecycleTransition: autoscaling:EC2_INSTANCE_TERMINATING
123122
name: aws-node-termination-handler

helm/cluster-aws/values.schema.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,6 @@
576576
"heartbeatTimeoutSeconds": {
577577
"type": "number",
578578
"title": "Heartbeat timeout for ASG lifecycle hook",
579-
"default": 1800,
580579
"maximum": 7200,
581580
"minimum": 30
582581
}

0 commit comments

Comments
 (0)