Skip to content

Commit 72eb366

Browse files
committed
Upgrade NTH to v1.25.5
1 parent 180a116 commit 72eb366

2 files changed

Lines changed: 11 additions & 3 deletions

File tree

pkg/model/components/nodeterminationhandler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ func (b *NodeTerminationHandlerOptionsBuilder) BuildOptions(o *kops.Cluster) err
101101
}
102102

103103
if nth.Version == nil {
104-
nth.Version = fi.PtrTo("v1.22.0")
104+
nth.Version = fi.PtrTo("v1.25.5")
105105
}
106106

107107
return nil

upup/models/cloudup/resources/addons/node-termination-handler.aws/k8s-1.11.yaml.template

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{ with .CloudProvider.AWS.NodeTerminationHandler }}
2-
# Sourced from https://github.com/aws/aws-node-termination-handler/releases/download/v1.22.0/all-resources.yaml
3-
# and https://github.com/aws/aws-node-termination-handler/releases/download/v1.22.0/all-resources-queue-processor.yaml
2+
# Sourced from https://github.com/aws/aws-node-termination-handler/releases/download/v1.25.5/all-resources.yaml
3+
# and https://github.com/aws/aws-node-termination-handler/releases/download/v1.25.5/all-resources-queue-processor.yaml
44
---
55
# Source: aws-node-termination-handler/templates/serviceaccount.yaml
66
apiVersion: v1
@@ -216,6 +216,12 @@ spec:
216216
value: "{{ WithDefaultBool .DeleteSQSMsgIfNodeNotFound false }}"
217217
- name: WORKERS
218218
value: "10"
219+
- name: HEARTBEAT_INTERVAL
220+
value: "-1"
221+
- name: HEARTBEAT_UNTIL
222+
value: "-1"
223+
- name: SQS_MSG_VISIBILITY_TIMEOUT_SEC
224+
value: "20"
219225
{{ if .WebhookTemplate }}
220226
- name: WEBHOOK_TEMPLATE
221227
value: '{{ .WebhookTemplate }}'
@@ -385,6 +391,8 @@ spec:
385391
value: "true"
386392
- name: ENABLE_SPOT_INTERRUPTION_DRAINING
387393
value: "{{ WithDefaultBool .EnableSpotInterruptionDraining true }}"
394+
- name: ENABLE_ASG_LIFECYCLE_DRAINING
395+
value: "true"
388396
- name: ENABLE_SCHEDULED_EVENT_DRAINING
389397
value: "{{ WithDefaultBool .EnableScheduledEventDraining true }}"
390398
- name: ENABLE_REBALANCE_MONITORING

0 commit comments

Comments
 (0)