From c6e19f877896bac10c0ddd2981fabcfa18252ae5 Mon Sep 17 00:00:00 2001 From: Jerad C Date: Tue, 26 Mar 2024 14:59:51 -0500 Subject: [PATCH 1/4] add k8s 1.29 to test versions --- .github/workflows/build-and-test.yaml | 2 +- test/k8s-local-cluster-test/provision-cluster | 12 ++++++++---- test/k8s-local-cluster-test/run-test | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index f555250c..ea559a53 100755 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -185,7 +185,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - k8sVersion: ["1.24", "1.25", "1.26", "1.27", "1.28"] + k8sVersion: ["1.23", "1.24", "1.25", "1.26", "1.27", "1.28", "1.29"] steps: - name: Set up Go 1.x uses: actions/setup-go@v2 diff --git a/test/k8s-local-cluster-test/provision-cluster b/test/k8s-local-cluster-test/provision-cluster index a2d8a211..ed31a146 100755 --- a/test/k8s-local-cluster-test/provision-cluster +++ b/test/k8s-local-cluster-test/provision-cluster @@ -9,6 +9,8 @@ OVERRIDE_PATH=0 KIND_CONFIG_FILE=$SCRIPTPATH/kind-three-node-cluster.yaml use_psp=false +# shellcheck disable=SC2034 +K8_1_29="kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245" # shellcheck disable=SC2034 K8_1_28="kindest/node:v1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31" # shellcheck disable=SC2034 @@ -19,11 +21,13 @@ K8_1_26="kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c5 K8_1_25="kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8" # shellcheck disable=SC2034 K8_1_24="kindest/node:v1.24.15@sha256:7db4f8bea3e14b82d12e044e25e34bd53754b7f2b0e9d56df21774e6f66a70ab" +# shellcheck disable=SC2034 +K8_1_23="kindest/node:v1.23.5@sha256:1a72748086bc24ed6163de1d1e33cc0e2eb5a1eb5ebffdb15b53c3bcd5376a6f" -K8_VERSION="$K8_1_28" +K8_VERSION="$K8_1_29" KUBECTL_VERSION=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt) -KIND_VERSION="0.20.0" -HELM_VERSION="3.13.2" +KIND_VERSION="0.22.0" +HELM_VERSION="3.14.3" echoerr() { echo "$@" 1>&2; } @@ -32,7 +36,7 @@ USAGE=$(cat << 'EOM' Executes the spot termination integration test for the Node Termination Handler. Outputs the cluster context directory to stdout on successful completion - Example: provision-cluster -b my-test -i 123 -v 1.28 + Example: provision-cluster -b my-test -i 123 -v 1.29 Optional: -b Base Name of cluster diff --git a/test/k8s-local-cluster-test/run-test b/test/k8s-local-cluster-test/run-test index be1e243c..0305335b 100755 --- a/test/k8s-local-cluster-test/run-test +++ b/test/k8s-local-cluster-test/run-test @@ -16,7 +16,7 @@ NODE_TERMINATION_HANDLER_DOCKER_IMG="" DEFAULT_WEBHOOK_DOCKER_IMG="webhook-test-proxy:customtest" WEBHOOK_DOCKER_IMG="" OVERRIDE_PATH=0 -K8S_VERSION="1.28" +K8S_VERSION="1.29" AEMM_URL="amazon-ec2-metadata-mock-service.default.svc.cluster.local" AEMM_VERSION="1.8.1" 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' -n Node Termination Handler Docker Image -d use GOPROXY=direct to bypass proxy.golang.org -o Override path w/ your own kubectl and kind binaries - -v Kubernetes Version (Default: 1.28) [1.24, 1.25, 1.26, 1.27, and 1.28] + -v Kubernetes Version (Default: 1.29) [1.23, 1.24, 1.25, 1.26, 1.27, 1.28, and 1.29] -w Webhook Docker Image EOM From 3040f2f65786fccc13cbba4b91106f1ff2b78de9 Mon Sep 17 00:00:00 2001 From: Jerad C Date: Wed, 27 Mar 2024 10:24:34 -0500 Subject: [PATCH 2/4] update k8s compatibility table --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 914921af..75317d17 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@

- kubernetes + kubernetes go-version @@ -81,12 +81,13 @@ Must be deployed as a Kubernetes **Deployment**. Also requires some **additional ### Kubernetes Compatibility -| NTH Release | K8s v1.28 | K8s v1.27 | K8s v1.26 | K8s v1.25 | K8s v1.24 | K8s v1.23 | -| :-----------------------------------------------------------------------------------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | -| [v1.21.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.21.0) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | -| [v1.20.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.20.0) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | -| [v1.19.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.19.0) | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ | +| NTH Release | K8s v1.29 | K8s v1.28 | K8s v1.27 | K8s v1.26 | K8s v1.25 | K8s v1.24 | K8s v1.23 | +| :-----------------------------------------------------------------------------------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | +| [v1.21.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.21.0) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | +| [v1.20.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.20.0) | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | +| [v1.19.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.19.0) | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ | ✅ | +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. ## Installation and Configuration From 9e60af81e01d7b79e2d53efec96a8701bde87aa5 Mon Sep 17 00:00:00 2001 From: Jerad C Date: Wed, 27 Mar 2024 13:31:01 -0500 Subject: [PATCH 3/4] update test suite kind versions --- test/k8s-local-cluster-test/provision-cluster | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/k8s-local-cluster-test/provision-cluster b/test/k8s-local-cluster-test/provision-cluster index ed31a146..ec91722e 100755 --- a/test/k8s-local-cluster-test/provision-cluster +++ b/test/k8s-local-cluster-test/provision-cluster @@ -12,17 +12,17 @@ use_psp=false # shellcheck disable=SC2034 K8_1_29="kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245" # shellcheck disable=SC2034 -K8_1_28="kindest/node:v1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31" +K8_1_28="kindest/node:v1.28.7@sha256:9bc6c451a289cf96ad0bbaf33d416901de6fd632415b076ab05f5fa7e4f65c58" # shellcheck disable=SC2034 -K8_1_27="kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72" +K8_1_27="kindest/node:v1.27.11@sha256:681253009e68069b8e01aad36a1e0fa8cf18bb0ab3e5c4069b2e65cafdd70843" # shellcheck disable=SC2034 -K8_1_26="kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb" +K8_1_26="kindest/node:v1.26.14@sha256:5d548739ddef37b9318c70cb977f57bf3e5015e4552be4e27e57280a8cbb8e4f" # shellcheck disable=SC2034 -K8_1_25="kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8" +K8_1_25="kindest/node:v1.25.16@sha256:e8b50f8e06b44bb65a93678a65a26248fae585b3d3c2a669e5ca6c90c69dc519" # shellcheck disable=SC2034 -K8_1_24="kindest/node:v1.24.15@sha256:7db4f8bea3e14b82d12e044e25e34bd53754b7f2b0e9d56df21774e6f66a70ab" +K8_1_24="kindest/node:v1.24.17@sha256:bad10f9b98d54586cba05a7eaa1b61c6b90bfc4ee174fdc43a7b75ca75c95e51" # shellcheck disable=SC2034 -K8_1_23="kindest/node:v1.23.5@sha256:1a72748086bc24ed6163de1d1e33cc0e2eb5a1eb5ebffdb15b53c3bcd5376a6f" +K8_1_23="kindest/node:v1.23.17@sha256:14d0a9a892b943866d7e6be119a06871291c517d279aedb816a4b4bc0ec0a5b3" K8_VERSION="$K8_1_29" KUBECTL_VERSION=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt) From fb35d1b467c8a9db5a89ed64f3fdc1ffd773613b Mon Sep 17 00:00:00 2001 From: Jerad C Date: Thu, 28 Mar 2024 11:38:10 -0500 Subject: [PATCH 4/4] fix minimum k8s version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 75317d17..6c39d385 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@

- kubernetes + kubernetes go-version