Skip to content

Commit b6e44c4

Browse files
authored
feat: Add k8s 1.30 to test versions (#1030)
1 parent 5a270ac commit b6e44c4

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
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.23", "1.24", "1.25", "1.26", "1.27", "1.28", "1.29"]
188+
k8sVersion: ["1.23", "1.24", "1.25", "1.26", "1.27", "1.28", "1.29", "1.30"]
189189
steps:
190190
- name: Set up Go 1.x
191191
uses: actions/setup-go@v2

README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@ When using the EC2 Console or EC2 API to terminate the instance, a state-change
8989

9090
### Kubernetes Compatibility
9191

92-
| NTH Release | K8s v1.29 | K8s v1.28 | K8s v1.27 | K8s v1.26 | K8s v1.25 | K8s v1.24 | K8s v1.23 |
93-
| :-----------------------------------------------------------------------------------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: |
94-
| [v1.22.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.22.0) ||||||||
95-
| [v1.21.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.21.0) ||||||||
96-
| [v1.20.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.20.0) ||||||||
97-
| [v1.19.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.19.0) ||||||||
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.22.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.22.0) |||||||||
95+
| [v1.21.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.21.0) | | |||||||
96+
| [v1.20.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.20.0) || | ||||||
97+
| [v1.19.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.19.0) |||||| | ||
9898

9999
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.
100100

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ CLUSTER_NAME_BASE=$(uuidgen | cut -d'-' -f1 | tr '[:upper:]' '[:lower:]')
88
OVERRIDE_PATH=0
99
KIND_CONFIG_FILE=$SCRIPTPATH/kind-three-node-cluster.yaml
1010
use_psp=false
11-
11+
# shellcheck disable=SC2034
12+
K8_1_30="kindest/node:v1.30@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e"
1213
# shellcheck disable=SC2034
1314
K8_1_29="kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245"
1415
# shellcheck disable=SC2034
@@ -24,7 +25,7 @@ K8_1_24="kindest/node:v1.24.17@sha256:bad10f9b98d54586cba05a7eaa1b61c6b90bfc4ee1
2425
# shellcheck disable=SC2034
2526
K8_1_23="kindest/node:v1.23.17@sha256:14d0a9a892b943866d7e6be119a06871291c517d279aedb816a4b4bc0ec0a5b3"
2627

27-
K8_VERSION="$K8_1_29"
28+
K8_VERSION="$K8_1_30"
2829
KUBECTL_VERSION=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
2930
KIND_VERSION="0.22.0"
3031
HELM_VERSION="3.14.3"
@@ -36,7 +37,7 @@ USAGE=$(cat << 'EOM'
3637
Executes the spot termination integration test for the Node Termination Handler.
3738
Outputs the cluster context directory to stdout on successful completion
3839
39-
Example: provision-cluster -b my-test -i 123 -v 1.29
40+
Example: provision-cluster -b my-test -i 123 -v 1.30
4041
4142
Optional:
4243
-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.29"
19+
K8S_VERSION="1.30"
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.29) [1.23, 1.24, 1.25, 1.26, 1.27, 1.28, and 1.29]
142+
-v Kubernetes Version (Default: 1.29) [1.23, 1.24, 1.25, 1.26, 1.27, 1.28, 1.29, and 1.30]
143143
-w Webhook Docker Image
144144
145145
EOM

0 commit comments

Comments
 (0)