From 08b3288c5f05bc4f9c74086c1281894c7aa75c03 Mon Sep 17 00:00:00 2001 From: Nitin Goyal Date: Tue, 12 Apr 2022 18:57:07 +0530 Subject: [PATCH] Remove EOL kubernetes version (#617) * Remove EOL kubernetes version Signed-off-by: Nitin Goyal * Add v1.23 kubernetes version support in test Signed-off-by: Nitin Goyal --- .github/workflows/build-and-test.yaml | 2 +- README.md | 2 +- test/k8s-compatibility-test/run-k8s-compatibility-test.sh | 4 ++-- test/k8s-local-cluster-test/provision-cluster | 4 ++-- test/k8s-local-cluster-test/run-test | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 034debf5..7a550b2b 100755 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -167,7 +167,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - k8sVersion: ["1.17", "1.18", "1.19", "1.20", "1.21", "1.22"] + k8sVersion: ["1.18", "1.19", "1.20", "1.21", "1.22", "1.23"] steps: - name: Set up Go 1.x uses: actions/setup-go@v2 diff --git a/README.md b/README.md index 6edd4175..cb0a0de4 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 1c21dccf..6052a0f3 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.22" "1.21" "1.20" "1.19" "1.18" "1.17") +versions=("1.23" "1.22" "1.21" "1.20" "1.19" "1.18") 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.17 - 1.22 supported) + Executes the spot termination integration test for each version of kubernetes (k8s 1.18 - 1.23 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 276c9bdb..773df544 100755 --- a/test/k8s-local-cluster-test/provision-cluster +++ b/test/k8s-local-cluster-test/provision-cluster @@ -8,6 +8,8 @@ CLUSTER_NAME_BASE=$(uuidgen | cut -d'-' -f1 | tr '[:upper:]' '[:lower:]') OVERRIDE_PATH=0 KIND_CONFIG_FILE=$SCRIPTPATH/kind-three-node-cluster.yaml +# shellcheck disable=SC2034 +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 @@ -18,8 +20,6 @@ K8_1_20="kindest/node:v1.20.70@sha256:cbeaf907fc78ac97ce7b625e4bf0de16e3ea725daf K8_1_19="kindest/node:v1.19.11@sha256:07db187ae84b4b7de440a73886f008cf903fcf5764ba8106a9fd5243d6f32729" # shellcheck disable=SC2034 K8_1_18="kindest/node:v1.18.19@sha256:7af1492e19b3192a79f606e43c35fb741e520d195f96399284515f077b3b622c" -# shellcheck disable=SC2034 -K8_1_17="kindest/node:v1.17.17@sha256:66f1d0d91a88b8a001811e2f1054af60eef3b669a9a74f9b6db871f2f1eeed00" K8_VERSION="$K8_1_20" KUBECTL_VERSION=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt) diff --git a/test/k8s-local-cluster-test/run-test b/test/k8s-local-cluster-test/run-test index cd975e40..f58c2140 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.20) [1.17, 1.18, 1.19, 1.20, 1.21, and 1.22] + -v Kubernetes Version (Default: 1.20) [1.18, 1.19, 1.20, 1.21, 1.22, and 1.23] -w Webhook Docker Image EOM