|
1 | 1 | include Makefile-deps.mk |
2 | 2 |
|
3 | 3 | # 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 |
6 | 6 |
|
7 | 7 | # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) |
8 | 8 | ifeq (,$(shell go env GOBIN)) |
@@ -46,7 +46,8 @@ PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST)))) |
46 | 46 | ARTIFACTS ?= $(PROJECT_DIR)/bin |
47 | 47 | GINKGO_VERSION ?= $(shell go list -m -f '{{.Version}}' github.com/onsi/ginkgo/v2) |
48 | 48 | 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 |
50 | 51 | USE_EXISTING_CLUSTER ?= false |
51 | 52 |
|
52 | 53 | GINKGO = $(shell pwd)/bin/ginkgo |
@@ -130,7 +131,7 @@ test-integration: manifests fmt vet envtest ginkgo ## Run integration tests. |
130 | 131 | .PHONY: test-e2e |
131 | 132 | # FIXME: we should install lws CRD. |
132 | 133 | 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 |
134 | 135 |
|
135 | 136 | GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint |
136 | 137 | GOLANGCI_LINT_VERSION ?= v1.63.4 |
@@ -208,7 +209,7 @@ loader-image-push: loader-image-build |
208 | 209 | KIND = $(shell pwd)/bin/kind |
209 | 210 | .PHONY: kind |
210 | 211 | 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} |
212 | 213 |
|
213 | 214 | .PHONY: kind-image-build |
214 | 215 | kind-image-build: PLATFORMS=linux/amd64 |
|
0 commit comments