diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f4ddc012..2fef49c4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -104,7 +104,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - k8sVersion: [1.14, 1.15, 1.16, 1.17, 1.18, 1.19] + k8sVersion: ["1.16", "1.17", "1.18", "1.19", "1.20", "1.21"] steps: - name: Set up Go 1.x uses: actions/setup-go@v2 diff --git a/README.md b/README.md index 1126f2cc..4fabb4e4 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@
-
+
diff --git a/test/eks-cluster-test/cluster-spec.yaml b/test/eks-cluster-test/cluster-spec.yaml
index d4cddaee..52b9409d 100644
--- a/test/eks-cluster-test/cluster-spec.yaml
+++ b/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.16'
+ version: '1.20'
cloudWatch:
clusterLogging:
enableTypes: ["*"]
diff --git a/test/k8s-compatibility-test/run-k8s-compatibility-test.sh b/test/k8s-compatibility-test/run-k8s-compatibility-test.sh
index 7ad0669a..ffe5df31 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.18" "1.17" "1.16" "1.15" "1.14" "1.13" "1.12")
+versions=("1.21" "1.20" "1.19" "1.18" "1.17" "1.16")
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.12 - 1.18 supported)
+ Executes the spot termination integration test for each version of kubernetes (k8s 1.16 - 1.21 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 9933f0d7..caab661c 100755
--- a/test/k8s-local-cluster-test/provision-cluster
+++ b/test/k8s-local-cluster-test/provision-cluster
@@ -9,22 +9,22 @@ OVERRIDE_PATH=0
KIND_CONFIG_FILE=$SCRIPTPATH/kind-three-node-cluster.yaml
# shellcheck disable=SC2034
-K8_1_19="kindest/node:v1.19.1@sha256:98cf5288864662e37115e362b23e4369c8c4a408f99cbc06e58ac30ddc721600"
+K8_1_21="kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6"
# shellcheck disable=SC2034
-K8_1_18="kindest/node:v1.18.8@sha256:f4bcc97a0ad6e7abaf3f643d890add7efe6ee4ab90baeb374b4f41a4c95567eb"
+K8_1_20="kindest/node:v1.20.70@sha256:cbeaf907fc78ac97ce7b625e4bf0de16e3ea725daf6b04f930bd14c67c671ff9"
# shellcheck disable=SC2034
-K8_1_17="kindest/node:v1.17.11@sha256:5240a7a2c34bf241afb54ac05669f8a46661912eab05705d660971eeb12f6555"
+K8_1_19="kindest/node:v1.19.11@sha256:07db187ae84b4b7de440a73886f008cf903fcf5764ba8106a9fd5243d6f32729"
# shellcheck disable=SC2034
-K8_1_16="kindest/node:v1.16.15@sha256:a89c771f7de234e6547d43695c7ab047809ffc71a0c3b65aa54eda051c45ed20"
+K8_1_18="kindest/node:v1.18.19@sha256:7af1492e19b3192a79f606e43c35fb741e520d195f96399284515f077b3b622c"
# shellcheck disable=SC2034
-K8_1_15="kindest/node:v1.15.12@sha256:d9b939055c1e852fe3d86955ee24976cab46cba518abcb8b13ba70917e6547a6"
+K8_1_17="kindest/node:v1.17.17@sha256:66f1d0d91a88b8a001811e2f1054af60eef3b669a9a74f9b6db871f2f1eeed00"
# shellcheck disable=SC2034
-K8_1_14="kindest/node:v1.14.10@sha256:ce4355398a704fca68006f8a29f37aafb49f8fc2f64ede3ccd0d9198da910146"
+K8_1_16="kindest/node:v1.16.15@sha256:83067ed51bf2a3395b24687094e283a7c7c865ccc12a8b1d7aa673ba0c5e8861"
-K8_VERSION="$K8_1_17"
+K8_VERSION="$K8_1_20"
KUBECTL_VERSION=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
-KIND_VERSION="0.9.0"
-HELM_VERSION="3.3.1"
+KIND_VERSION="0.11.1"
+HELM_VERSION="3.6.0"
echoerr() { echo "$@" 1>&2; }
@@ -33,7 +33,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.16
+ Example: provision-cluster -b my-test -i 123 -v 1.20
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 bd6a9cff..942f6803 100755
--- a/test/k8s-local-cluster-test/run-test
+++ b/test/k8s-local-cluster-test/run-test
@@ -135,7 +135,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.16) [1.12, 1.13, 1.14, 1.15, 1.16, 1.17, and 1.18]
+ -v Kubernetes Version (Default: 1.20) [1.16, 1.17, 1.18, 1.19, 1.20, and 1.21]
-w Webhook Docker Image
EOM