Skip to content

Commit b9012d8

Browse files
authored
cleanup: upgrade e2e test tools (#296)
1 parent 3ae97d2 commit b9012d8

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

Makefile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
include Makefile-deps.mk
22

33
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
4-
ENVTEST_K8S_VERSION = 1.28.3
5-
ENVTEST_LWS_VERSION = v0.4.0
4+
ENVTEST_K8S_VERSION = 1.32.0
5+
ENVTEST_LWS_VERSION = v0.5.1
66

77
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
88
ifeq (,$(shell go env GOBIN))
@@ -46,7 +46,8 @@ PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
4646
ARTIFACTS ?= $(PROJECT_DIR)/bin
4747
GINKGO_VERSION ?= $(shell go list -m -f '{{.Version}}' github.com/onsi/ginkgo/v2)
4848
GO_VERSION := $(shell awk '/^go /{print $$2}' go.mod|head -n1)
49-
E2E_KIND_VERSION ?= kindest/node:v1.30.0
49+
E2E_KIND_NODE_VERSION ?= kindest/node:v1.32.2
50+
E2E_KIND_VERSION ?= v0.27.0
5051
USE_EXISTING_CLUSTER ?= false
5152

5253
GINKGO = $(shell pwd)/bin/ginkgo
@@ -130,7 +131,7 @@ test-integration: manifests fmt vet envtest ginkgo ## Run integration tests.
130131
.PHONY: test-e2e
131132
# FIXME: we should install lws CRD.
132133
test-e2e: kustomize manifests fmt vet envtest ginkgo kind-image-build
133-
E2E_KIND_VERSION=$(E2E_KIND_VERSION) KIND_CLUSTER_NAME=$(KIND_CLUSTER_NAME) KIND=$(KIND) KUBECTL=$(KUBECTL) KUSTOMIZE=$(KUSTOMIZE) GINKGO=$(GINKGO) USE_EXISTING_CLUSTER=$(USE_EXISTING_CLUSTER) IMAGE_TAG=$(IMG) ENVTEST_LWS_VERSION=$(ENVTEST_LWS_VERSION) ./hack/e2e-test.sh
134+
E2E_KIND_NODE_VERSION=$(E2E_KIND_NODE_VERSION) KIND_CLUSTER_NAME=$(KIND_CLUSTER_NAME) KIND=$(KIND) KUBECTL=$(KUBECTL) KUSTOMIZE=$(KUSTOMIZE) GINKGO=$(GINKGO) USE_EXISTING_CLUSTER=$(USE_EXISTING_CLUSTER) IMAGE_TAG=$(IMG) ENVTEST_LWS_VERSION=$(ENVTEST_LWS_VERSION) ./hack/e2e-test.sh
134135

135136
GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
136137
GOLANGCI_LINT_VERSION ?= v1.63.4
@@ -208,7 +209,7 @@ loader-image-push: loader-image-build
208209
KIND = $(shell pwd)/bin/kind
209210
.PHONY: kind
210211
kind:
211-
@GOBIN=$(PROJECT_DIR)/bin GO111MODULE=on go install sigs.k8s.io/kind@v0.23.0
212+
@GOBIN=$(PROJECT_DIR)/bin GO111MODULE=on go install sigs.k8s.io/kind@${E2E_KIND_VERSION}
212213

213214
.PHONY: kind-image-build
214215
kind-image-build: PLATFORMS=linux/amd64

hack/e2e-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function cleanup {
2929
function startup {
3030
if [ $USE_EXISTING_CLUSTER == 'false' ]
3131
then
32-
$KIND create cluster --name $KIND_CLUSTER_NAME --image $E2E_KIND_VERSION --config ./hack/kind-config.yaml
32+
$KIND create cluster --name $KIND_CLUSTER_NAME --image $E2E_KIND_NODE_VERSION --config ./hack/kind-config.yaml
3333
fi
3434
}
3535
function kind_load {

0 commit comments

Comments
 (0)