From 292905eb58331fd57556649d037e531bc42dc896 Mon Sep 17 00:00:00 2001 From: Jerad C Date: Fri, 14 Apr 2023 13:15:03 -0500 Subject: [PATCH 1/3] update k8s test versions --- .github/workflows/build-and-test.yaml | 2 +- README.md | 2 +- .../run-k8s-compatibility-test.sh | 4 ++-- test/k8s-local-cluster-test/provision-cluster | 10 +--------- test/k8s-local-cluster-test/run-test | 4 ++-- 5 files changed, 7 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 9b5e14db..f0048d9a 100755 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -168,7 +168,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - k8sVersion: ["1.18", "1.19", "1.20", "1.21", "1.22", "1.23", "1.24", "1.25"] + k8sVersion: ["1.22", "1.23", "1.24", "1.25"] steps: - name: Set up Go 1.x uses: actions/setup-go@v2 diff --git a/README.md b/README.md index 827dc354..bfba90e9 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@

- kubernetes + kubernetes go-version diff --git a/test/k8s-compatibility-test/run-k8s-compatibility-test.sh b/test/k8s-compatibility-test/run-k8s-compatibility-test.sh index 6052a0f3..226ede30 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.23" "1.22" "1.21" "1.20" "1.19" "1.18") +versions=("1.25" "1.24" "1.23" "1.22") 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.18 - 1.23 supported) + Executes the spot termination integration test for each version of kubernetes (k8s 1.22 - 1.25 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 4d493d4d..0eb32cde 100755 --- a/test/k8s-local-cluster-test/provision-cluster +++ b/test/k8s-local-cluster-test/provision-cluster @@ -17,16 +17,8 @@ K8_1_24="kindest/node:v1.24.7@sha256:5c015142d9b60a0f6c45573f809957076514e38ec97 K8_1_23="kindest/node:v1.23.5@sha256:1a72748086bc24ed6163de1d1e33cc0e2eb5a1eb5ebffdb15b53c3bcd5376a6f" # shellcheck disable=SC2034 K8_1_22="kindest/node:v1.22.2@sha256:f638a08c1f68fe2a99e724ace6df233a546eaf6713019a0b310130a4f91ebe7f" -# shellcheck disable=SC2034 -K8_1_21="kindest/node:v1.21.2@sha256:9d07ff05e4afefbba983fac311807b3c17a5f36e7061f6cb7e2ba756255b2be4" -# shellcheck disable=SC2034 -K8_1_20="kindest/node:v1.20.70@sha256:cbeaf907fc78ac97ce7b625e4bf0de16e3ea725daf6b04f930bd14c67c671ff9" -# shellcheck disable=SC2034 -K8_1_19="kindest/node:v1.19.11@sha256:07db187ae84b4b7de440a73886f008cf903fcf5764ba8106a9fd5243d6f32729" -# shellcheck disable=SC2034 -K8_1_18="kindest/node:v1.18.19@sha256:7af1492e19b3192a79f606e43c35fb741e520d195f96399284515f077b3b622c" -K8_VERSION="$K8_1_20" +K8_VERSION="$K8_1_22" KUBECTL_VERSION=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt) KIND_VERSION="0.17.0" HELM_VERSION="3.10.0" diff --git a/test/k8s-local-cluster-test/run-test b/test/k8s-local-cluster-test/run-test index 3d2db516..a0c579d8 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.20" +K8S_VERSION="1.22" 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" @@ -136,7 +136,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.20) [1.18, 1.19, 1.20, 1.21, 1.22, 1.23, 1.24, and 1.25] + -v Kubernetes Version (Default: 1.22) [1.22, 1.23, 1.24, and 1.25] -w Webhook Docker Image EOM From 49c73fb38825d4207b015df372452d567b71869a Mon Sep 17 00:00:00 2001 From: Jerad C Date: Fri, 14 Apr 2023 14:48:01 -0500 Subject: [PATCH 2/3] add k8s 1.26 to test versions --- .github/workflows/build-and-test.yaml | 2 +- test/k8s-local-cluster-test/provision-cluster | 2 ++ test/k8s-local-cluster-test/run-test | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index f0048d9a..b86f3a86 100755 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -168,7 +168,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - k8sVersion: ["1.22", "1.23", "1.24", "1.25"] + k8sVersion: ["1.22", "1.23", "1.24", "1.25", "1.26"] 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 0eb32cde..aa9419dd 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_26="kindest/node:v1.26.3@sha256:94eb63275ad6305210041cdb5aca87c8562cc50fa152dbec3fef8c58479db4ff" # shellcheck disable=SC2034 K8_1_25="kindest/node:v1.25.3@sha256:f1de3b0670462f43280114eccceab8bf1b9576d2afe0582f8f74529da6fd0365" # shellcheck disable=SC2034 diff --git a/test/k8s-local-cluster-test/run-test b/test/k8s-local-cluster-test/run-test index a0c579d8..620975f1 100755 --- a/test/k8s-local-cluster-test/run-test +++ b/test/k8s-local-cluster-test/run-test @@ -136,7 +136,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.22) [1.22, 1.23, 1.24, and 1.25] + -v Kubernetes Version (Default: 1.22) [1.22, 1.23, 1.24, 1.25, and 1.26] -w Webhook Docker Image EOM From e48ac7642ff2b5418a178bb0b23bc9bfa8a98d87 Mon Sep 17 00:00:00 2001 From: Jerad C Date: Wed, 19 Apr 2023 15:21:31 -0500 Subject: [PATCH 3/3] pr feedback --- test/k8s-compatibility-test/run-k8s-compatibility-test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/k8s-compatibility-test/run-k8s-compatibility-test.sh b/test/k8s-compatibility-test/run-k8s-compatibility-test.sh index 226ede30..407f2ec5 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.25" "1.24" "1.23" "1.22") +versions=("1.26" "1.25" "1.24" "1.23" "1.22") 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.22 - 1.25 supported) + Executes the spot termination integration test for each version of kubernetes (k8s 1.22 - 1.26 supported) Examples: # run test with direct download of go modules