Skip to content

Commit c3e411b

Browse files
authored
Enable scheduled event draining by default (#741)
1 parent 542c1ae commit c3e411b

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

config/helm/aws-node-termination-handler/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ The configuration in this table applies to AWS Node Termination Handler in queue
123123
The configuration in this table applies to AWS Node Termination Handler in IMDS mode.
124124

125125
| Parameter | Description | Default |
126-
| -------------------------------- |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| ---------------------- |
126+
| -------------------------------- |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------|
127127
| `targetNodeOs` | Space separated list of node OS's to target (e.g. `"linux"`, `"windows"`, `"linux windows"`). Windows support is **EXPERIMENTAL**. | `"linux"` |
128128
| `linuxPodLabels` | Labels to add to each Linux pod. | `{}` |
129129
| `windowsPodLabels` | Labels to add to each Windows pod. | `{}` |
@@ -153,7 +153,7 @@ The configuration in this table applies to AWS Node Termination Handler in IMDS
153153
| `enableProbesServer` | If `true`, start an http server exposing `/healthz` endpoint for probes. | `false` |
154154
| `metadataTries` | The number of times to try requesting metadata. | `3` |
155155
| `enableSpotInterruptionDraining` | If `true`, drain nodes when the spot interruption termination notice is received. | `true` |
156-
| `enableScheduledEventDraining` | If `true`, drain nodes before the maintenance window starts for an EC2 instance scheduled event. | `false` |
156+
| `enableScheduledEventDraining` | If `true`, drain nodes before the maintenance window starts for an EC2 instance scheduled event. | `true` |
157157
| `enableRebalanceMonitoring` | If `true`, cordon nodes when the rebalance recommendation notice is received. If you'd like to drain the node in addition to cordoning, then also set `enableRebalanceDraining`. | `false` |
158158
| `enableRebalanceDraining` | If `true`, drain nodes when the rebalance recommendation notice is received. | `false` |
159159

config/helm/aws-node-termination-handler/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,8 @@ metadataTries: 3
268268
# enableSpotInterruptionDraining If false, do not drain nodes when the spot interruption termination notice is received
269269
enableSpotInterruptionDraining: true
270270

271-
# enableScheduledEventDraining If true, drain nodes before the maintenance window starts for an EC2 instance scheduled event
272-
enableScheduledEventDraining: false
271+
# enableScheduledEventDraining If false, do not drain nodes before the maintenance window starts for an EC2 instance scheduled event
272+
enableScheduledEventDraining: true
273273

274274
# enableRebalanceMonitoring If true, cordon nodes when the rebalance recommendation notice is received
275275
enableRebalanceMonitoring: false

pkg/config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ const (
4949
webhookTemplateFileConfigKey = "WEBHOOK_TEMPLATE_FILE"
5050
webhookTemplateDefault = `{"text":"[NTH][Instance Interruption] EventID: {{ .EventID }} - Kind: {{ .Kind }} - Instance: {{ .InstanceID }} - Node: {{ .NodeName }} - Description: {{ .Description }} - Start Time: {{ .StartTime }}"}`
5151
enableScheduledEventDrainingConfigKey = "ENABLE_SCHEDULED_EVENT_DRAINING"
52-
enableScheduledEventDrainingDefault = false
52+
enableScheduledEventDrainingDefault = true
5353
enableSpotInterruptionDrainingConfigKey = "ENABLE_SPOT_INTERRUPTION_DRAINING"
5454
enableSpotInterruptionDrainingDefault = true
5555
enableSQSTerminationDrainingConfigKey = "ENABLE_SQS_TERMINATION_DRAINING"

0 commit comments

Comments
 (0)