Skip to content

Commit dc2c91a

Browse files
tiationg-khotiationg-kho
authored
Merge branch 'aws:main' into 1097-daemon
2 parents 61ec184 + 07c0756 commit dc2c91a

File tree

9 files changed

+32
-41
lines changed

9 files changed

+32
-41
lines changed

‎.github/workflows/build-and-test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ jobs:
191191
runs-on: ubuntu-20.04
192192
strategy:
193193
matrix:
194-
k8sVersion: ["1.23", "1.24", "1.25", "1.26", "1.27", "1.28", "1.29", "1.30"]
194+
k8sVersion: ["1.29", "1.30", "1.31"]
195195
steps:
196196
- name: Set up Go 1.x
197197
uses: actions/setup-go@v2

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ upload-resources-to-github-windows:
160160

161161
generate-k8s-yaml:
162162
${MAKEFILE_PATH}/scripts/generate-k8s-yaml
163-
${MAKEFILE_PATH}/scripts/generate-k8s-yaml -k "1.25.0" -s ${K8S_1_25_ASSET_SUFFIX}
163+
${MAKEFILE_PATH}/scripts/generate-k8s-yaml -k "1.31.2" -s ${K8S_1_25_ASSET_SUFFIX}
164164

165165
sync-readme-to-ecr-public:
166166
@ECR_REGISTRY=${ECR_REGISTRY} ${MAKEFILE_PATH}/scripts/ecr-public-login

‎README.md‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -83,20 +83,21 @@ When using the EC2 Console or EC2 API to terminate the instance, a state-change
8383
| Spot Instance Termination Notifications (ITN) | ✅ | ✅ |
8484
| Scheduled Events | ✅ | ✅ |
8585
| Instance Rebalance Recommendation | ✅ | ✅ |
86-
| ASG Termination Lifecycle Hooks | ✅ | ✅ |
86+
| ASG Termination Lifecycle Hooks | ❌ | ✅ |
8787
| AZ Rebalance Recommendation | ❌ | ✅ |
8888
| Instance State Change Events | ❌ | ✅ |
8989

9090
### Kubernetes Compatibility
9191

92-
| NTH Release | K8s v1.30 | K8s v1.29 | K8s v1.28 | K8s v1.27 | K8s v1.26 | K8s v1.25 | K8s v1.24 | K8s v1.23 |
93-
| :-----------------------------------------------------------------------------------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: |
94-
| [v1.23.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.23.0) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
95-
| [v1.22.1](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.22.1) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
96-
| [v1.22.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.22.0) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
97-
| [v1.21.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.21.0) | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
98-
| [v1.20.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.20.0) | ❌ | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
99-
| [v1.19.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.19.0) | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ | ✅ |
92+
| NTH Release | K8s v1.31 | K8s v1.30 | K8s v1.29 | K8s v1.28 | K8s v1.27 | K8s v1.26 | K8s v1.25 | K8s v1.24 | K8s v1.23 |
93+
| :-----------------------------------------------------------------------------------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: |
94+
| [v1.23.1](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.23.1) | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
95+
| [v1.23.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.23.0) | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
96+
| [v1.22.1](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.22.1) | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
97+
| [v1.22.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.22.0) | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
98+
| [v1.21.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.21.0) | ❌ | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
99+
| [v1.20.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.20.0) | ❌ | ❌ | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
100+
| [v1.19.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.19.0) | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ | ✅ |
100101

101102
A ✅ indicates that a specific aws-node-termination-handler release has been tested with a specific Kubernetes version. A ❌ indicates that a specific aws-node-termination-handler release has not been tested with a specific Kubernetes version.
102103

@@ -136,7 +137,7 @@ When using Kubernetes [Pod Security Admission](https://kubernetes.io/docs/concep
136137
You can use kubectl to directly add all of the above resources with the default configuration into your cluster.
137138

138139
```
139-
kubectl apply -f https://github.com/aws/aws-node-termination-handler/releases/download/v1.23.0/all-resources.yaml
140+
kubectl apply -f https://github.com/aws/aws-node-termination-handler/releases/download/v1.23.1/all-resources.yaml
140141
```
141142

142143
For a full list of releases and associated artifacts see our [releases page](https://github.com/aws/aws-node-termination-handler/releases).
@@ -209,7 +210,7 @@ helm upgrade --install aws-node-termination-handler \
209210
oci://public.ecr.aws/aws-ec2/helm/aws-node-termination-handler --version $CHART_VERSION
210211
```
211212

212-
For a full list of configuration options see our [Helm readme](https://github.com/aws/aws-node-termination-handler/blob/v1.23.0/config/helm/aws-node-termination-handler#readme).
213+
For a full list of configuration options see our [Helm readme](https://github.com/aws/aws-node-termination-handler/blob/v1.23.1/config/helm/aws-node-termination-handler#readme).
213214

214215
</details>
215216

@@ -499,7 +500,7 @@ helm upgrade --install aws-node-termination-handler \
499500
oci://public.ecr.aws/aws-ec2/helm/aws-node-termination-handler --version $CHART_VERSION
500501
```
501502

502-
For a full list of configuration options see our [Helm readme](https://github.com/aws/aws-node-termination-handler/blob/v1.23.0/config/helm/aws-node-termination-handler#readme).
503+
For a full list of configuration options see our [Helm readme](https://github.com/aws/aws-node-termination-handler/blob/v1.23.1/config/helm/aws-node-termination-handler#readme).
503504

504505
#### Single Instance vs Multiple Replicas
505506

@@ -524,7 +525,7 @@ Queue Processor needs an **SQS queue URL** to function; therefore, manifest chan
524525
Minimal Config:
525526

526527
```
527-
curl -L https://github.com/aws/aws-node-termination-handler/releases/download/v1.23.0/all-resources-queue-processor.yaml -o all-resources-queue-processor.yaml
528+
curl -L https://github.com/aws/aws-node-termination-handler/releases/download/v1.23.1/all-resources-queue-processor.yaml -o all-resources-queue-processor.yaml
528529
<open all-resources-queue-processor.yaml and update QUEUE_URL value>
529530
kubectl apply -f ./all-resources-queue-processor.yaml
530531
```

‎config/helm/aws-node-termination-handler/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v2
22
name: aws-node-termination-handler
33
description: A Helm chart for the AWS Node Termination Handler.
44
type: application
5-
version: 0.25.0
6-
appVersion: 1.23.0
5+
version: 0.25.1
6+
appVersion: 1.23.1
77
kubeVersion: ">= 1.16-0"
88
keywords:
99
- aws

‎pkg/config/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ const (
5454
enableSpotInterruptionDrainingConfigKey = "ENABLE_SPOT_INTERRUPTION_DRAINING"
5555
enableSpotInterruptionDrainingDefault = true
5656
enableASGLifecycleDrainingConfigKey = "ENABLE_ASG_LIFECYCLE_DRAINING"
57-
enableASGLifecycleDrainingDefault = true
57+
enableASGLifecycleDrainingDefault = false
5858
enableSQSTerminationDrainingConfigKey = "ENABLE_SQS_TERMINATION_DRAINING"
5959
enableSQSTerminationDrainingDefault = false
6060
enableRebalanceMonitoringConfigKey = "ENABLE_REBALANCE_MONITORING"

‎scripts/generate-k8s-yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ VERSION=$(make -s -f $MAKEFILEPATH version)
77
BUILD_DIR=$SCRIPTPATH/../build/k8s-resources/$VERSION
88

99
PLATFORM=$(uname | tr '[:upper:]' '[:lower:]')
10-
HELM_VERSION="3.7.1"
10+
HELM_VERSION="3.16.2"
1111
NAMESPACE="kube-system"
12-
K8S_VERSION="1.24.0"
12+
K8S_VERSION="1.31.2"
1313
SUFFIX=""
1414

1515
USAGE=$(cat << EOM

‎test/k8s-compatibility-test/run-k8s-compatibility-test.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
set -euo pipefail
33

44
SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
5-
versions=("1.26" "1.25" "1.24" "1.23" "1.22")
5+
versions=("1.29" "1.30" "1.31")
66
E_CODE=0
77
AFTER_FIRST_RUN_ARGS=""
88
PASS_THRU_ARGS=""
99

1010
USAGE=$(cat << 'EOM'
1111
Usage: run-k8s-compatability-test [-h]
12-
Executes the spot termination integration test for each version of kubernetes (k8s 1.22 - 1.26 supported)
12+
Executes the spot termination integration test for each version of kubernetes (k8s 1.29 - 1.31 supported)
1313
1414
Examples:
1515
# run test with direct download of go modules
@@ -36,7 +36,7 @@ done
3636

3737
for i in "${!versions[@]}"; do
3838
version=${versions[$i]}
39-
$SCRIPTPATH/../k8s-local-cluster-test/run-test -b "test-$version" -v $version $PASS_THRU_ARGS $AFTER_FIRST_RUN_ARGS
39+
$SCRIPTPATH/../k8s-local-cluster-test/run-test -b "test-${version//./-}" -v $version $PASS_THRU_ARGS $AFTER_FIRST_RUN_ARGS
4040
if [ $? -eq 0 ]; then
4141
echo "✅ Passed test for K8s version $version"
4242
else

‎test/k8s-local-cluster-test/provision-cluster‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,16 @@ OVERRIDE_PATH=0
99
KIND_CONFIG_FILE=$SCRIPTPATH/kind-three-node-cluster.yaml
1010
use_psp=false
1111
# shellcheck disable=SC2034
12+
K8_1_31="kindest/node:v1.31.2@sha256:18fbefc20a7113353c7b75b5c869d7145a6abd6269154825872dc59c1329912e"
13+
# shellcheck disable=SC2034
1214
K8_1_30="kindest/node:v1.30@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e"
1315
# shellcheck disable=SC2034
1416
K8_1_29="kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245"
15-
# shellcheck disable=SC2034
16-
K8_1_28="kindest/node:v1.28.7@sha256:9bc6c451a289cf96ad0bbaf33d416901de6fd632415b076ab05f5fa7e4f65c58"
17-
# shellcheck disable=SC2034
18-
K8_1_27="kindest/node:v1.27.11@sha256:681253009e68069b8e01aad36a1e0fa8cf18bb0ab3e5c4069b2e65cafdd70843"
19-
# shellcheck disable=SC2034
20-
K8_1_26="kindest/node:v1.26.14@sha256:5d548739ddef37b9318c70cb977f57bf3e5015e4552be4e27e57280a8cbb8e4f"
21-
# shellcheck disable=SC2034
22-
K8_1_25="kindest/node:v1.25.16@sha256:e8b50f8e06b44bb65a93678a65a26248fae585b3d3c2a669e5ca6c90c69dc519"
23-
# shellcheck disable=SC2034
24-
K8_1_24="kindest/node:v1.24.17@sha256:bad10f9b98d54586cba05a7eaa1b61c6b90bfc4ee174fdc43a7b75ca75c95e51"
25-
# shellcheck disable=SC2034
26-
K8_1_23="kindest/node:v1.23.17@sha256:14d0a9a892b943866d7e6be119a06871291c517d279aedb816a4b4bc0ec0a5b3"
2717

28-
K8_VERSION="$K8_1_30"
18+
K8_VERSION="$K8_1_31"
2919
KUBECTL_VERSION=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
30-
KIND_VERSION="0.22.0"
31-
HELM_VERSION="3.14.3"
20+
KIND_VERSION="0.25.0"
21+
HELM_VERSION="3.16.2"
3222

3323
echoerr() { echo "$@" 1>&2; }
3424

@@ -37,7 +27,7 @@ USAGE=$(cat << 'EOM'
3727
Executes the spot termination integration test for the Node Termination Handler.
3828
Outputs the cluster context directory to stdout on successful completion
3929
40-
Example: provision-cluster -b my-test -i 123 -v 1.30
30+
Example: provision-cluster -b my-test -i 123 -v 1.31
4131
4232
Optional:
4333
-b Base Name of cluster

‎test/k8s-local-cluster-test/run-test‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ NODE_TERMINATION_HANDLER_DOCKER_IMG=""
1616
DEFAULT_WEBHOOK_DOCKER_IMG="webhook-test-proxy:customtest"
1717
WEBHOOK_DOCKER_IMG=""
1818
OVERRIDE_PATH=0
19-
K8S_VERSION="1.30"
19+
K8S_VERSION="1.31"
2020
AEMM_URL="amazon-ec2-metadata-mock-service.default.svc.cluster.local"
2121
AEMM_VERSION="1.12.0"
2222
AEMM_DL_URL="https://github.com/aws/amazon-ec2-metadata-mock/releases/download/v$AEMM_VERSION/amazon-ec2-metadata-mock-$AEMM_VERSION.tgz"
@@ -139,7 +139,7 @@ USAGE=$(cat << 'EOM'
139139
-n Node Termination Handler Docker Image
140140
-d use GOPROXY=direct to bypass proxy.golang.org
141141
-o Override path w/ your own kubectl and kind binaries
142-
-v Kubernetes Version (Default: 1.29) [1.23, 1.24, 1.25, 1.26, 1.27, 1.28, 1.29, and 1.30]
142+
-v Kubernetes Version (Default: 1.31) [1.29, 1.30, and 1.31]
143143
-w Webhook Docker Image
144144
145145
EOM

0 commit comments

Comments
 (0)