Upgrade k8s versions (#1261)

Co-authored-by: ec2-bot 🤖 <ec2-bot@users.noreply.github.com>

Author: LikithaVemulapalli

.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.32", "1.33", "1.34", "1.35"]
     steps:
     - name: Set up Go 1.x
       uses: actions/setup-go@v2

Makefile

@@ -29,7 +29,7 @@ WINDOWS_2022 ?= "windows-10.0.20348.2582/amd64"
 BINARY_NAME ?= "node-termination-handler"
 THIRD_PARTY_LICENSES = "${MAKEFILE_PATH}/THIRD_PARTY_LICENSES.md"
 GOLICENSES = $(BIN_DIR)/go-licenses
-K8S_1_29_ASSET_SUFFIX = "_k8s-1-29-or-newer"
+K8S_1_32_ASSET_SUFFIX = "_k8s-1-32-or-newer"
 AMAZON_ECR_CREDENTIAL_HELPER_VERSION = 0.7.1
 
 $(shell mkdir -p ${BUILD_DIR_PATH} && touch ${BUILD_DIR_PATH}/_go.mod)
@@ -141,14 +141,14 @@ build-binaries-windows-2022:
 
 upload-resources-to-github:
 	${MAKEFILE_PATH}/scripts/upload-resources-to-github
-	${MAKEFILE_PATH}/scripts/upload-resources-to-github -k -s ${K8S_1_29_ASSET_SUFFIX}
+	${MAKEFILE_PATH}/scripts/upload-resources-to-github -k -s ${K8S_1_32_ASSET_SUFFIX}
 
 upload-resources-to-github-windows:
 	powershell -File ${MAKEFILE_PATH}/scripts/upload-resources-to-github-windows.ps1 -BinariesOnly
 
 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.35.0" -s ${K8S_1_32_ASSET_SUFFIX}
 
 sync-readme-to-ecr-public:
 	@ECR_REGISTRY=${ECR_REGISTRY} ${MAKEFILE_PATH}/scripts/ecr-public-login

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.35.0"
 SUFFIX=""
 
 USAGE=$(cat << EOM

test/eks-cluster-test/cluster-spec.yaml

@@ -4,7 +4,7 @@ kind: ClusterConfig
 metadata:
   name: nth-eks-cluster-test
   region: us-west-2
-  version: '1.27'
+  version: '1.32'
 cloudWatch:
   clusterLogging:
     enableTypes: ["*"]

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.32" "1.33" "1.34" "1.35")
 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.32 - 1.35 supported)
 
   Examples:
           # run test with direct download of go modules

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

@@ -9,17 +9,17 @@ OVERRIDE_PATH=0
 KIND_CONFIG_FILE=$SCRIPTPATH/kind-three-node-cluster.yaml
 use_psp=false
 # shellcheck disable=SC2034
-K8_1_32="kindest/node:v1.32.2@sha256:f226345927d7e348497136874b6d207e0b32cc52154ad8323129352923a3142f"
+K8_1_35="kindest/node:v1.35.0@sha256:452d707d4862f52530247495d180205e029056831160e22870e37e3f6c1ac31f"
 # shellcheck disable=SC2034
-K8_1_31="kindest/node:v1.31.2@sha256:18fbefc20a7113353c7b75b5c869d7145a6abd6269154825872dc59c1329912e"
+K8_1_34="kindest/node:v1.34.3@sha256:08497ee19eace7b4b5348db5c6a1591d7752b164530a36f855cb0f2bdcbadd48"
 # shellcheck disable=SC2034
-K8_1_30="kindest/node:v1.30@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e"
+K8_1_33="kindest/node:v1.33.7@sha256:d26ef333bdb2cbe9862a0f7c3803ecc7b4303d8cea8e814b481b09949d353040"
 # shellcheck disable=SC2034
-K8_1_29="kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245"
+K8_1_32="kindest/node:v1.32.11@sha256:5fc52d52a7b9574015299724bd68f183702956aa4a2116ae75a63cb574b35af8"
 
-K8_VERSION="$K8_1_32"
+K8_VERSION="$K8_1_35"
 KUBECTL_VERSION=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
-KIND_VERSION="0.27.0"
+KIND_VERSION="0.31.0"
 HELM_VERSION="3.17.1"
 
 echoerr() { echo "$@" 1>&2; }
@@ -29,7 +29,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.35
 
           Optional:
             -b          Base Name of cluster

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.35"
 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.35) [1.32, 1.33, 1.34 and 1.35]
             -w          Webhook Docker Image
 
 EOM