Skip to content

Commit

Permalink
add k8s 1.29 to test versions
Browse files Browse the repository at this point in the history
  • Loading branch information
cjerad committed Mar 26, 2024
1 parent 1088b64 commit c6e19f8
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
k8sVersion: ["1.24", "1.25", "1.26", "1.27", "1.28"]
k8sVersion: ["1.23", "1.24", "1.25", "1.26", "1.27", "1.28", "1.29"]
steps:
- name: Set up Go 1.x
uses: actions/setup-go@v2
Expand Down
12 changes: 8 additions & 4 deletions test/k8s-local-cluster-test/provision-cluster
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ OVERRIDE_PATH=0
KIND_CONFIG_FILE=$SCRIPTPATH/kind-three-node-cluster.yaml
use_psp=false

# shellcheck disable=SC2034
K8_1_29="kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245"
# shellcheck disable=SC2034
K8_1_28="kindest/node:v1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31"
# shellcheck disable=SC2034
Expand All @@ -19,11 +21,13 @@ K8_1_26="kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c5
K8_1_25="kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8"
# shellcheck disable=SC2034
K8_1_24="kindest/node:v1.24.15@sha256:7db4f8bea3e14b82d12e044e25e34bd53754b7f2b0e9d56df21774e6f66a70ab"
# shellcheck disable=SC2034
K8_1_23="kindest/node:v1.23.5@sha256:1a72748086bc24ed6163de1d1e33cc0e2eb5a1eb5ebffdb15b53c3bcd5376a6f"

K8_VERSION="$K8_1_28"
K8_VERSION="$K8_1_29"
KUBECTL_VERSION=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
KIND_VERSION="0.20.0"
HELM_VERSION="3.13.2"
KIND_VERSION="0.22.0"
HELM_VERSION="3.14.3"

echoerr() { echo "$@" 1>&2; }

Expand All @@ -32,7 +36,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.28
Example: provision-cluster -b my-test -i 123 -v 1.29
Optional:
-b Base Name of cluster
Expand Down
4 changes: 2 additions & 2 deletions test/k8s-local-cluster-test/run-test
Original file line number Diff line number Diff line change
Expand Up @@ -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.28"
K8S_VERSION="1.29"
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"
Expand Down Expand Up @@ -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.28) [1.24, 1.25, 1.26, 1.27, and 1.28]
-v Kubernetes Version (Default: 1.29) [1.23, 1.24, 1.25, 1.26, 1.27, 1.28, and 1.29]
-w Webhook Docker Image
EOM
Expand Down

0 comments on commit c6e19f8

Please sign in to comment.