From 20da870e10613b83c41b4cc13141647297a8d94b Mon Sep 17 00:00:00 2001 From: Connor Catlett Date: Wed, 18 Jan 2023 19:59:13 +0000 Subject: [PATCH] Bump CI k8s version to 1.26.1 (and other CI tools upgrades) Signed-off-by: Connor Catlett --- Makefile | 2 +- hack/e2e/run.sh | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 522499a345..a535b10dc8 100644 --- a/Makefile +++ b/Makefile @@ -113,7 +113,7 @@ bin /tmp/helm /tmp/kubeval: @mkdir -p $@ bin/helm: | /tmp/helm bin - @curl -o /tmp/helm/helm.tar.gz -sSL https://get.helm.sh/helm-v3.10.1-${GOOS}-amd64.tar.gz + @curl -o /tmp/helm/helm.tar.gz -sSL https://get.helm.sh/helm-v3.11.0-${GOOS}-amd64.tar.gz @tar -zxf /tmp/helm/helm.tar.gz -C bin --strip-components=1 @rm -rf /tmp/helm/* diff --git a/hack/e2e/run.sh b/hack/e2e/run.sh index 9981e06cc0..708c128804 100755 --- a/hack/e2e/run.sh +++ b/hack/e2e/run.sh @@ -50,15 +50,15 @@ IMAGE_TAG=${IMAGE_TAG:-${TEST_ID}} # kops: must include patch version (e.g. 1.19.1) # eksctl: mustn't include patch version (e.g. 1.19) -K8S_VERSION_KOPS=${K8S_VERSION_KOPS:-${K8S_VERSION:-1.25.2}} -K8S_VERSION_EKSCTL=${K8S_VERSION_EKSCTL:-${K8S_VERSION:-1.23}} +K8S_VERSION_KOPS=${K8S_VERSION_KOPS:-${K8S_VERSION:-1.26.1}} +K8S_VERSION_EKSCTL=${K8S_VERSION_EKSCTL:-${K8S_VERSION:-1.24}} -KOPS_VERSION=${KOPS_VERSION:-1.25.2} +KOPS_VERSION=${KOPS_VERSION:-1.25.3} KOPS_STATE_FILE=${KOPS_STATE_FILE:-s3://k8s-kops-csi-e2e} KOPS_PATCH_FILE=${KOPS_PATCH_FILE:-./hack/kops-patch.yaml} KOPS_PATCH_NODE_FILE=${KOPS_PATCH_NODE_FILE:-./hack/kops-patch-node.yaml} -EKSCTL_VERSION=${EKSCTL_VERSION:-0.115.0} +EKSCTL_VERSION=${EKSCTL_VERSION:-0.125.0} EKSCTL_PATCH_FILE=${EKSCTL_PATCH_FILE:-./hack/eksctl-patch.yaml} EKSCTL_ADMIN_ROLE=${EKSCTL_ADMIN_ROLE:-} # Creates a windows node group. @@ -75,7 +75,7 @@ GINKGO_NODES=${GINKGO_NODES:-4} TEST_EXTRA_FLAGS=${TEST_EXTRA_FLAGS:-} EBS_INSTALL_SNAPSHOT=${EBS_INSTALL_SNAPSHOT:-"false"} -EBS_INSTALL_SNAPSHOT_VERSION=${EBS_INSTALL_SNAPSHOT_VERSION:-"v6.1.0"} +EBS_INSTALL_SNAPSHOT_VERSION=${EBS_INSTALL_SNAPSHOT_VERSION:-"v6.2.1"} HELM_CT_TEST=${HELM_CT_TEST:-"false"} CHART_TESTING_VERSION=${CHART_TESTING_VERSION:-3.7.1} @@ -111,7 +111,7 @@ else GINKGO_BIN=${BIN_DIR}/ginkgo if [[ ! -e ${GINKGO_BIN} ]]; then pushd /tmp - GOPATH=${TEST_DIR} GOBIN=${BIN_DIR} go install github.com/onsi/ginkgo/v2/ginkgo@v2.2.0 + GOPATH=${TEST_DIR} GOBIN=${BIN_DIR} go install github.com/onsi/ginkgo/v2/ginkgo@v2.7.0 popd ginkgo version fi