diff --git a/config/helm/aws-node-termination-handler/README.md b/config/helm/aws-node-termination-handler/README.md index 5f7a7bd8..e4809a7a 100644 --- a/config/helm/aws-node-termination-handler/README.md +++ b/config/helm/aws-node-termination-handler/README.md @@ -123,7 +123,7 @@ The configuration in this table applies to AWS Node Termination Handler in queue The configuration in this table applies to AWS Node Termination Handler in IMDS mode. | Parameter | Description | Default | -| -------------------------------- |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| ---------------------- | +| -------------------------------- |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------| | `targetNodeOs` | Space separated list of node OS's to target (e.g. `"linux"`, `"windows"`, `"linux windows"`). Windows support is **EXPERIMENTAL**. | `"linux"` | | `linuxPodLabels` | Labels to add to each Linux pod. | `{}` | | `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 | `enableProbesServer` | If `true`, start an http server exposing `/healthz` endpoint for probes. | `false` | | `metadataTries` | The number of times to try requesting metadata. | `3` | | `enableSpotInterruptionDraining` | If `true`, drain nodes when the spot interruption termination notice is received. | `true` | -| `enableScheduledEventDraining` | If `true`, drain nodes before the maintenance window starts for an EC2 instance scheduled event. | `false` | +| `enableScheduledEventDraining` | If `true`, drain nodes before the maintenance window starts for an EC2 instance scheduled event. | `true` | | `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` | | `enableRebalanceDraining` | If `true`, drain nodes when the rebalance recommendation notice is received. | `false` | diff --git a/config/helm/aws-node-termination-handler/values.yaml b/config/helm/aws-node-termination-handler/values.yaml index ecd4d382..62a94c1e 100644 --- a/config/helm/aws-node-termination-handler/values.yaml +++ b/config/helm/aws-node-termination-handler/values.yaml @@ -268,8 +268,8 @@ metadataTries: 3 # enableSpotInterruptionDraining If false, do not drain nodes when the spot interruption termination notice is received enableSpotInterruptionDraining: true -# enableScheduledEventDraining If true, drain nodes before the maintenance window starts for an EC2 instance scheduled event -enableScheduledEventDraining: false +# enableScheduledEventDraining If false, do not drain nodes before the maintenance window starts for an EC2 instance scheduled event +enableScheduledEventDraining: true # enableRebalanceMonitoring If true, cordon nodes when the rebalance recommendation notice is received enableRebalanceMonitoring: false diff --git a/pkg/config/config.go b/pkg/config/config.go index 7806c5b0..61d53e63 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -49,7 +49,7 @@ const ( webhookTemplateFileConfigKey = "WEBHOOK_TEMPLATE_FILE" webhookTemplateDefault = `{"text":"[NTH][Instance Interruption] EventID: {{ .EventID }} - Kind: {{ .Kind }} - Instance: {{ .InstanceID }} - Node: {{ .NodeName }} - Description: {{ .Description }} - Start Time: {{ .StartTime }}"}` enableScheduledEventDrainingConfigKey = "ENABLE_SCHEDULED_EVENT_DRAINING" - enableScheduledEventDrainingDefault = false + enableScheduledEventDrainingDefault = true enableSpotInterruptionDrainingConfigKey = "ENABLE_SPOT_INTERRUPTION_DRAINING" enableSpotInterruptionDrainingDefault = true enableSQSTerminationDrainingConfigKey = "ENABLE_SQS_TERMINATION_DRAINING"