Skip to content

Commit aa21a71

Browse files
cjeradcjerad
authored
add k8s 1.29 to test versions (aws#986)
* update k8s compatibility table * update test suite kind versions
1 parent 1088b64 commit aa21a71

File tree

4 files changed

+23
-18
lines changed

4 files changed

+23
-18
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ jobs:
185185
runs-on: ubuntu-20.04
186186
strategy:
187187
matrix:
188-
k8sVersion: ["1.24", "1.25", "1.26", "1.27", "1.28"]
188+
k8sVersion: ["1.23", "1.24", "1.25", "1.26", "1.27", "1.28", "1.29"]
189189
steps:
190190
- name: Set up Go 1.x
191191
uses: actions/setup-go@v2

‎README.md

+7-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<p>
66
<a href="https://github.com/kubernetes/kubernetes/releases">
7-
<img src="https://img.shields.io/badge/Kubernetes-%3E%3D%201.22-brightgreen" alt="kubernetes">
7+
<img src="https://img.shields.io/badge/Kubernetes-%3E%3D%201.23-brightgreen" alt="kubernetes">
88
</a>
99
<a href="https://golang.org/doc/go1.21">
1010
<img src="https://img.shields.io/github/go-mod/go-version/aws/aws-node-termination-handler?color=blueviolet" alt="go-version">
@@ -81,12 +81,13 @@ Must be deployed as a Kubernetes **Deployment**. Also requires some **additional
8181

8282
### Kubernetes Compatibility
8383

84-
| NTH Release | K8s v1.28 | K8s v1.27 | K8s v1.26 | K8s v1.25 | K8s v1.24 | K8s v1.23 |
85-
| :-----------------------------------------------------------------------------------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: |
86-
| [v1.21.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.21.0) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
87-
| [v1.20.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.20.0) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
88-
| [v1.19.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.19.0) | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ |
84+
| NTH Release | K8s v1.29 | K8s v1.28 | K8s v1.27 | K8s v1.26 | K8s v1.25 | K8s v1.24 | K8s v1.23 |
85+
| :-----------------------------------------------------------------------------------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: |
86+
| [v1.21.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.21.0) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
87+
| [v1.20.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.20.0) | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
88+
| [v1.19.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.19.0) | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ | ✅ |
8989

90+
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.
9091

9192
## Installation and Configuration
9293

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

+13-9
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,24 @@ KIND_CONFIG_FILE=$SCRIPTPATH/kind-three-node-cluster.yaml
1010
use_psp=false
1111

1212
# shellcheck disable=SC2034
13-
K8_1_28="kindest/node:v1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31"
13+
K8_1_29="kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245"
1414
# shellcheck disable=SC2034
15-
K8_1_27="kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72"
15+
K8_1_28="kindest/node:v1.28.7@sha256:9bc6c451a289cf96ad0bbaf33d416901de6fd632415b076ab05f5fa7e4f65c58"
1616
# shellcheck disable=SC2034
17-
K8_1_26="kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb"
17+
K8_1_27="kindest/node:v1.27.11@sha256:681253009e68069b8e01aad36a1e0fa8cf18bb0ab3e5c4069b2e65cafdd70843"
1818
# shellcheck disable=SC2034
19-
K8_1_25="kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8"
19+
K8_1_26="kindest/node:v1.26.14@sha256:5d548739ddef37b9318c70cb977f57bf3e5015e4552be4e27e57280a8cbb8e4f"
2020
# shellcheck disable=SC2034
21-
K8_1_24="kindest/node:v1.24.15@sha256:7db4f8bea3e14b82d12e044e25e34bd53754b7f2b0e9d56df21774e6f66a70ab"
21+
K8_1_25="kindest/node:v1.25.16@sha256:e8b50f8e06b44bb65a93678a65a26248fae585b3d3c2a669e5ca6c90c69dc519"
22+
# shellcheck disable=SC2034
23+
K8_1_24="kindest/node:v1.24.17@sha256:bad10f9b98d54586cba05a7eaa1b61c6b90bfc4ee174fdc43a7b75ca75c95e51"
24+
# shellcheck disable=SC2034
25+
K8_1_23="kindest/node:v1.23.17@sha256:14d0a9a892b943866d7e6be119a06871291c517d279aedb816a4b4bc0ec0a5b3"
2226

23-
K8_VERSION="$K8_1_28"
27+
K8_VERSION="$K8_1_29"
2428
KUBECTL_VERSION=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
25-
KIND_VERSION="0.20.0"
26-
HELM_VERSION="3.13.2"
29+
KIND_VERSION="0.22.0"
30+
HELM_VERSION="3.14.3"
2731

2832
echoerr() { echo "$@" 1>&2; }
2933

@@ -32,7 +36,7 @@ USAGE=$(cat << 'EOM'
3236
Executes the spot termination integration test for the Node Termination Handler.
3337
Outputs the cluster context directory to stdout on successful completion
3438
35-
Example: provision-cluster -b my-test -i 123 -v 1.28
39+
Example: provision-cluster -b my-test -i 123 -v 1.29
3640
3741
Optional:
3842
-b Base Name of cluster

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

+2-2
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.28"
19+
K8S_VERSION="1.29"
2020
AEMM_URL="amazon-ec2-metadata-mock-service.default.svc.cluster.local"
2121
AEMM_VERSION="1.8.1"
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.28) [1.24, 1.25, 1.26, 1.27, and 1.28]
142+
-v Kubernetes Version (Default: 1.29) [1.23, 1.24, 1.25, 1.26, 1.27, 1.28, and 1.29]
143143
-w Webhook Docker Image
144144
145145
EOM

0 commit comments

Comments
 (0)