Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove EOL kubernetes version #617

Merged
merged 4 commits into from
Apr 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<p>
<a href="https://github.com/kubernetes/kubernetes/releases">
<img src="https://img.shields.io/badge/Kubernetes-%3E%3D%201.17-brightgreen" alt="kubernetes">
<img src="https://img.shields.io/badge/Kubernetes-%3E%3D%201.18-brightgreen" alt="kubernetes">
</a>
<a href="https://golang.org/doc/go1.16">
<img src="https://img.shields.io/github/go-mod/go-version/aws/aws-node-termination-handler?color=blueviolet" alt="go-version">
Expand Down
4 changes: 2 additions & 2 deletions test/k8s-compatibility-test/run-k8s-compatibility-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/k8s-local-cluster-test/provision-cluster
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/k8s-local-cluster-test/run-test
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down