From 2fd85d3f0557ac05522e53446164357a2163178b Mon Sep 17 00:00:00 2001 From: jrab66 Date: Thu, 20 Jun 2024 14:54:29 -0600 Subject: [PATCH] feat: Add k8s 1.30 to test versions --- .github/workflows/build-and-test.yaml | 2 +- README.md | 12 ++++++------ test/k8s-local-cluster-test/provision-cluster | 7 ++++--- test/k8s-local-cluster-test/run-test | 4 ++-- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 5688b722..1d02c282 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.23", "1.24", "1.25", "1.26", "1.27", "1.28", "1.29"] + k8sVersion: ["1.23", "1.24", "1.25", "1.26", "1.27", "1.28", "1.29", "1.30"] steps: - name: Set up Go 1.x uses: actions/setup-go@v2 diff --git a/README.md b/README.md index 86a58872..eb86eaf3 100644 --- a/README.md +++ b/README.md @@ -89,12 +89,12 @@ When using the EC2 Console or EC2 API to terminate the instance, a state-change ### Kubernetes Compatibility -| NTH Release | K8s v1.29 | K8s v1.28 | K8s v1.27 | K8s v1.26 | K8s v1.25 | K8s v1.24 | K8s v1.23 | -| :-----------------------------------------------------------------------------------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | -| [v1.22.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.22.0) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | -| [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.30 | K8s v1.29 | K8s v1.28 | K8s v1.27 | K8s v1.26 | K8s v1.25 | K8s v1.24 | K8s v1.23 | +| :-----------------------------------------------------------------------------------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | +| [v1.22.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.22.0) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | +| [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. diff --git a/test/k8s-local-cluster-test/provision-cluster b/test/k8s-local-cluster-test/provision-cluster index ec91722e..bde5f4f8 100755 --- a/test/k8s-local-cluster-test/provision-cluster +++ b/test/k8s-local-cluster-test/provision-cluster @@ -8,7 +8,8 @@ CLUSTER_NAME_BASE=$(uuidgen | cut -d'-' -f1 | tr '[:upper:]' '[:lower:]') OVERRIDE_PATH=0 KIND_CONFIG_FILE=$SCRIPTPATH/kind-three-node-cluster.yaml use_psp=false - +# shellcheck disable=SC2034 +K8_1_30="kindest/node:v1.30@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e" # shellcheck disable=SC2034 K8_1_29="kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245" # shellcheck disable=SC2034 @@ -24,7 +25,7 @@ K8_1_24="kindest/node:v1.24.17@sha256:bad10f9b98d54586cba05a7eaa1b61c6b90bfc4ee1 # shellcheck disable=SC2034 K8_1_23="kindest/node:v1.23.17@sha256:14d0a9a892b943866d7e6be119a06871291c517d279aedb816a4b4bc0ec0a5b3" -K8_VERSION="$K8_1_29" +K8_VERSION="$K8_1_30" KUBECTL_VERSION=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt) KIND_VERSION="0.22.0" HELM_VERSION="3.14.3" @@ -36,7 +37,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.29 + Example: provision-cluster -b my-test -i 123 -v 1.30 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 0305335b..fd80d9fd 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.29" +K8S_VERSION="1.30" 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.29) [1.23, 1.24, 1.25, 1.26, 1.27, 1.28, and 1.29] + -v Kubernetes Version (Default: 1.29) [1.23, 1.24, 1.25, 1.26, 1.27, 1.28, 1.29, and 1.30] -w Webhook Docker Image EOM