From 008d7d20b6124473f8ad25fb90bca99f904d61e6 Mon Sep 17 00:00:00 2001 From: Heeyoung Jung Date: Wed, 13 Aug 2025 13:09:25 -0700 Subject: [PATCH] update k8s version to 1.33 --- .github/workflows/build-and-test.yaml | 2 +- Makefile | 2 +- scripts/generate-k8s-yaml | 4 ++-- .../run-k8s-compatibility-test.sh | 4 ++-- test/k8s-local-cluster-test/provision-cluster | 10 ++++++---- test/k8s-local-cluster-test/run-test | 4 ++-- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 65140e00..77e5d3df 100755 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -191,7 +191,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 diff --git a/Makefile b/Makefile index ae272e2d..5bcbf1a3 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.1" -s ${K8S_1_29_ASSET_SUFFIX} sync-readme-to-ecr-public: @ECR_REGISTRY=${ECR_REGISTRY} ${MAKEFILE_PATH}/scripts/ecr-public-login diff --git a/scripts/generate-k8s-yaml b/scripts/generate-k8s-yaml index d264851d..0718d8b7 100755 --- a/scripts/generate-k8s-yaml +++ b/scripts/generate-k8s-yaml @@ -7,9 +7,9 @@ VERSION=$(make -s -f $MAKEFILEPATH version) BUILD_DIR=$SCRIPTPATH/../build/k8s-resources/$VERSION PLATFORM=$(uname | tr '[:upper:]' '[:lower:]') -HELM_VERSION="3.17.1" +HELM_VERSION="3.17.4" NAMESPACE="kube-system" -K8S_VERSION="1.32.2" +K8S_VERSION="1.33.1" 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..5920a648 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.1@sha256:050072256b9a903bd914c0b2866828150cb229cea0efe5892e2b644d5dd3b34f" +# 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,10 +19,10 @@ 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" +KIND_VERSION="0.29.0" +HELM_VERSION="3.17.4" echoerr() { echo "$@" 1>&2; } @@ -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..0e643106 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