Skip to content

Commit 2588e9a

Browse files
tiationg-khotiationg-kho
authored
Add k8s 1.32 support (#1133)
* Add k8s 1.32 support
1 parent 866ff36 commit 2588e9a

File tree

7 files changed

+25
-24
lines changed

7 files changed

+25
-24
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.29", "1.30", "1.31"]
194+
k8sVersion: ["1.29", "1.30", "1.31", "1.32"]
195195
steps:
196196
- name: Set up Go 1.x
197197
uses: actions/setup-go@v2

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ WINDOWS_2022 ?= "windows-10.0.20348.2582/amd64"
3030
BINARY_NAME ?= "node-termination-handler"
3131
THIRD_PARTY_LICENSES = "${MAKEFILE_PATH}/THIRD_PARTY_LICENSES.md"
3232
GOLICENSES = $(BIN_DIR)/go-licenses
33-
K8S_1_25_ASSET_SUFFIX = "_k8s-1-25-or-newer"
33+
K8S_1_29_ASSET_SUFFIX = "_k8s-1-29-or-newer"
3434
AMAZON_ECR_CREDENTIAL_HELPER_VERSION = 0.7.1
3535

3636
$(shell mkdir -p ${BUILD_DIR_PATH} && touch ${BUILD_DIR_PATH}/_go.mod)
@@ -153,14 +153,14 @@ build-binaries-windows-2022:
153153

154154
upload-resources-to-github:
155155
${MAKEFILE_PATH}/scripts/upload-resources-to-github
156-
${MAKEFILE_PATH}/scripts/upload-resources-to-github -k -s ${K8S_1_25_ASSET_SUFFIX}
156+
${MAKEFILE_PATH}/scripts/upload-resources-to-github -k -s ${K8S_1_29_ASSET_SUFFIX}
157157

158158
upload-resources-to-github-windows:
159159
powershell -File ${MAKEFILE_PATH}/scripts/upload-resources-to-github-windows.ps1 -BinariesOnly
160160

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

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

‎README.md‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -164,16 +164,15 @@ helm upgrade --install aws-node-termination-handler \
164164

165165
### Kubernetes Compatibility
166166

167-
| 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 |
168-
| :-----------------------------------------------------------------------------------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: |
169-
| [v1.24.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.24.0) | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
170-
| [v1.23.1](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.23.1) | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
171-
| [v1.23.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.23.0) | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
172-
| [v1.22.1](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.22.1) | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
173-
| [v1.22.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.22.0) | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
174-
| [v1.21.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.21.0) | ❌ | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
175-
| [v1.20.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.20.0) | ❌ | ❌ | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
176-
| [v1.19.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.19.0) | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ | ✅ |
167+
| NTH Release | K8s v1.32 | K8s v1.31 | K8s v1.30 | K8s v1.29 | K8s v1.28 | K8s v1.27 | K8s v1.26 | K8s v1.25 |
168+
| :-----------------------------------------------------------------------------------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: |
169+
| [v1.24.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.24.0) | ❌ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | ❌ |
170+
| [v1.23.1](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.23.1) | ❌ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | ❌ |
171+
| [v1.23.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.23.0) | ❌ | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
172+
| [v1.22.1](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.22.1) | ❌ | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
173+
| [v1.22.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.22.0) | ❌ | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
174+
| [v1.21.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.21.0) | ❌ | ❌ | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ |
175+
| [v1.20.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.20.0) | ❌ | ❌ | ❌ | ❌ | ✅ | ✅ | ✅ | ✅ |
177176

178177
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.
179178

‎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.16.2"
10+
HELM_VERSION="3.17.1"
1111
NAMESPACE="kube-system"
12-
K8S_VERSION="1.31.2"
12+
K8S_VERSION="1.32.2"
1313
SUFFIX=""
1414

1515
USAGE=$(cat << EOM

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

Lines changed: 2 additions & 2 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.29" "1.30" "1.31")
5+
versions=("1.29" "1.30" "1.31" "1.32")
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.29 - 1.31 supported)
12+
Executes the spot termination integration test for each version of kubernetes (k8s 1.29 - 1.32 supported)
1313
1414
Examples:
1515
# run test with direct download of go modules

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,18 @@ OVERRIDE_PATH=0
99
KIND_CONFIG_FILE=$SCRIPTPATH/kind-three-node-cluster.yaml
1010
use_psp=false
1111
# shellcheck disable=SC2034
12+
K8_1_32="kindest/node:v1.32.2@sha256:f226345927d7e348497136874b6d207e0b32cc52154ad8323129352923a3142f"
13+
# shellcheck disable=SC2034
1214
K8_1_31="kindest/node:v1.31.2@sha256:18fbefc20a7113353c7b75b5c869d7145a6abd6269154825872dc59c1329912e"
1315
# shellcheck disable=SC2034
1416
K8_1_30="kindest/node:v1.30@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e"
1517
# shellcheck disable=SC2034
1618
K8_1_29="kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245"
1719

18-
K8_VERSION="$K8_1_31"
20+
K8_VERSION="$K8_1_32"
1921
KUBECTL_VERSION=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
20-
KIND_VERSION="0.25.0"
21-
HELM_VERSION="3.16.2"
22+
KIND_VERSION="0.27.0"
23+
HELM_VERSION="3.17.1"
2224

2325
echoerr() { echo "$@" 1>&2; }
2426

@@ -27,7 +29,7 @@ USAGE=$(cat << 'EOM'
2729
Executes the spot termination integration test for the Node Termination Handler.
2830
Outputs the cluster context directory to stdout on successful completion
2931
30-
Example: provision-cluster -b my-test -i 123 -v 1.31
32+
Example: provision-cluster -b my-test -i 123 -v 1.32
3133
3234
Optional:
3335
-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.31"
19+
K8S_VERSION="1.32"
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.31) [1.29, 1.30, and 1.31]
142+
-v Kubernetes Version (Default: 1.32) [1.29, 1.30, 1.31 and 1.32]
143143
-w Webhook Docker Image
144144
145145
EOM

0 commit comments

Comments
 (0)