From ac4d576df8831c0c399ee8fff1e85469e90b8c44 Mon Sep 17 00:00:00 2001 From: Mike Dame Date: Thu, 12 May 2022 14:08:40 +0000 Subject: [PATCH] Update e2e test versions --- Makefile | 4 ++-- hack/verify-gofmt.sh | 2 +- test/run-e2e-tests.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 84c729bb4..871dd618a 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ ARCHS = amd64 arm arm64 LDFLAGS=-ldflags "-X ${LDFLAG_LOCATION}.version=${VERSION} -X ${LDFLAG_LOCATION}.buildDate=${BUILD} -X ${LDFLAG_LOCATION}.gitbranch=${BRANCH} -X ${LDFLAG_LOCATION}.gitsha1=${SHA1}" -GOLANGCI_VERSION := v1.43.0 +GOLANGCI_VERSION := v1.46.1 HAS_GOLANGCI := $(shell ls _output/bin/golangci-lint 2> /dev/null) # REGISTRY is the container registry to push @@ -144,4 +144,4 @@ test-helm: ensure-helm-install ensure-helm-install: ifndef HAS_HELM curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 && chmod 700 ./get_helm.sh && ./get_helm.sh -endif \ No newline at end of file +endif diff --git a/hack/verify-gofmt.sh b/hack/verify-gofmt.sh index 79f5e7f11..2e70cf104 100755 --- a/hack/verify-gofmt.sh +++ b/hack/verify-gofmt.sh @@ -23,7 +23,7 @@ DESCHEDULER_ROOT=$(dirname "${BASH_SOURCE}")/.. GO_VERSION=($(go version)) -if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.14|go1.15|go1.16|go1.17') ]]; then +if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.14|go1.15|go1.16|go1.17|go1.18') ]]; then echo "Unknown go version '${GO_VERSION[2]}', skipping gofmt." exit 1 fi diff --git a/test/run-e2e-tests.sh b/test/run-e2e-tests.sh index 19c30d539..3e24e96e8 100755 --- a/test/run-e2e-tests.sh +++ b/test/run-e2e-tests.sh @@ -20,9 +20,9 @@ set -o nounset # This just runs e2e tests. if [ -n "$KIND_E2E" ]; then - K8S_VERSION=${KUBERNETES_VERSION:-v1.21.1} + K8S_VERSION=${KUBERNETES_VERSION:-v1.24.0} curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/${K8S_VERSION}/bin/linux/amd64/kubectl && chmod +x kubectl && mv kubectl /usr/local/bin/ - wget https://github.com/kubernetes-sigs/kind/releases/download/v0.11.0/kind-linux-amd64 + wget https://github.com/kubernetes-sigs/kind/releases/download/v0.13.0/kind-linux-amd64 chmod +x kind-linux-amd64 mv kind-linux-amd64 kind export PATH=$PATH:$PWD