diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index c2d299b9..df105627 100755 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -194,7 +194,7 @@ jobs: runs-on: ubuntu-24.04 strategy: matrix: - k8sVersion: ["1.29", "1.30", "1.31", "1.32"] + k8sVersion: ["1.29", "1.30", "1.31", "1.32", "1.33"] steps: - name: Set up Go 1.x uses: actions/setup-go@v2 @@ -214,4 +214,4 @@ jobs: key: gocache - name: E2E Tests - run: test/k8s-local-cluster-test/run-test -v ${{ matrix.k8sVersion }} \ No newline at end of file + run: test/k8s-local-cluster-test/run-test -v ${{ matrix.k8sVersion }} diff --git a/Makefile b/Makefile index ae272e2d..90a8da05 100644 --- a/Makefile +++ b/Makefile @@ -148,7 +148,7 @@ upload-resources-to-github-windows: generate-k8s-yaml: ${MAKEFILE_PATH}/scripts/generate-k8s-yaml - ${MAKEFILE_PATH}/scripts/generate-k8s-yaml -k "1.32.2" -s ${K8S_1_29_ASSET_SUFFIX} + ${MAKEFILE_PATH}/scripts/generate-k8s-yaml -k "1.33.7" -s ${K8S_1_29_ASSET_SUFFIX} sync-readme-to-ecr-public: @ECR_REGISTRY=${ECR_REGISTRY} ${MAKEFILE_PATH}/scripts/ecr-public-login diff --git a/README.md b/README.md index 13063e6d..10802c8f 100644 --- a/README.md +++ b/README.md @@ -166,20 +166,20 @@ helm upgrade --install aws-node-termination-handler \ ### Kubernetes Compatibility -| 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 | -| :-----------------------------------------------------------------------------------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | -| [v1.25.4](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.25.4) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | ❌ | -| [v1.25.3](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.25.3) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | ❌ | -| [v1.25.2](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.25.2) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | ❌ | -| [v1.25.1](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.25.1) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | ❌ | -| [v1.25.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.25.0) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | ❌ | -| [v1.24.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.24.0) | ❌ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | ❌ | -| [v1.23.1](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.23.1) | ❌ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | ❌ | -| [v1.23.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.23.0) | ❌ | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | -| [v1.22.1](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.22.1) | ❌ | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | -| [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) | ❌ | ❌ | ❌ | ❌ | ✅ | ✅ | ✅ | ✅ | +| NTH Release | K8s v1.33 | K8s v1.32 | K8s v1.31 | K8s v1.30 | K8s v1.29 | K8s v1.28 | +| :-----------------------------------------------------------------------------------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | +| [v1.25.4](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.25.4) | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [v1.25.3](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.25.3) | ❌ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [v1.25.2](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.25.2) | ❌ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [v1.25.1](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.25.1) | ❌ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [v1.25.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.25.0) | ❌ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [v1.24.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.24.0) | ❌ | ❌ | ✅ | ✅ | ✅ | ❌ | +| [v1.23.1](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.23.1) | ❌ | ❌ | ✅ | ✅ | ✅ | ❌ | +| [v1.23.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.23.0) | ❌ | ❌ | ❌ | ✅ | ✅ | ✅ | +| [v1.22.1](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.22.1) | ❌ | ❌ | ❌ | ✅ | ✅ | ✅ | +| [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) | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ | 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/scripts/generate-k8s-yaml b/scripts/generate-k8s-yaml index d264851d..82258fed 100755 --- a/scripts/generate-k8s-yaml +++ b/scripts/generate-k8s-yaml @@ -9,7 +9,7 @@ BUILD_DIR=$SCRIPTPATH/../build/k8s-resources/$VERSION PLATFORM=$(uname | tr '[:upper:]' '[:lower:]') HELM_VERSION="3.17.1" NAMESPACE="kube-system" -K8S_VERSION="1.32.2" +K8S_VERSION="1.33.7" SUFFIX="" USAGE=$(cat << EOM diff --git a/test/k8s-compatibility-test/run-k8s-compatibility-test.sh b/test/k8s-compatibility-test/run-k8s-compatibility-test.sh index 21f9bd43..e4cee7a9 100755 --- a/test/k8s-compatibility-test/run-k8s-compatibility-test.sh +++ b/test/k8s-compatibility-test/run-k8s-compatibility-test.sh @@ -2,14 +2,14 @@ set -euo pipefail SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" -versions=("1.29" "1.30" "1.31" "1.32") +versions=("1.29" "1.30" "1.31" "1.32" "1.33") E_CODE=0 AFTER_FIRST_RUN_ARGS="" PASS_THRU_ARGS="" USAGE=$(cat << 'EOM' Usage: run-k8s-compatability-test [-h] - Executes the spot termination integration test for each version of kubernetes (k8s 1.29 - 1.32 supported) + Executes the spot termination integration test for each version of kubernetes (k8s 1.29 - 1.33 supported) Examples: # run test with direct download of go modules diff --git a/test/k8s-local-cluster-test/provision-cluster b/test/k8s-local-cluster-test/provision-cluster index d4593007..8c766fb4 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_33="kindest/node:v1.33.7@sha256:d26ef333bdb2cbe9862a0f7c3803ecc7b4303d8cea8e814b481b09949d353040" +# shellcheck disable=SC2034 K8_1_32="kindest/node:v1.32.2@sha256:f226345927d7e348497136874b6d207e0b32cc52154ad8323129352923a3142f" # shellcheck disable=SC2034 K8_1_31="kindest/node:v1.31.2@sha256:18fbefc20a7113353c7b75b5c869d7145a6abd6269154825872dc59c1329912e" @@ -17,7 +19,7 @@ K8_1_30="kindest/node:v1.30@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a # shellcheck disable=SC2034 K8_1_29="kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245" -K8_VERSION="$K8_1_32" +K8_VERSION="$K8_1_33" KUBECTL_VERSION=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt) KIND_VERSION="0.27.0" HELM_VERSION="3.17.1" @@ -29,7 +31,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.32 + Example: provision-cluster -b my-test -i 123 -v 1.33 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 37a4b01e..8ef4d4f7 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.32" +K8S_VERSION="1.33" AEMM_URL="amazon-ec2-metadata-mock-service.default.svc.cluster.local" AEMM_VERSION="1.12.0" 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.32) [1.29, 1.30, 1.31 and 1.32] + -v Kubernetes Version (Default: 1.33) [1.29, 1.30, 1.31, 1.32 and 1.33] -w Webhook Docker Image EOM