Skip to content

Commit 92f61bb

Browse files
committed
use k8s v1.31.1 in envtest, use --index
1 parent 337ee2d commit 92f61bb

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ MUTABLE_TAG ?= latest
55
IMAGE = $(REGISTRY)machine-api-operator
66
BUILD_IMAGE ?= registry.ci.openshift.org/openshift/release:golang-1.22
77
GOLANGCI_LINT = go run ./vendor/github.com/golangci/golangci-lint/cmd/golangci-lint
8+
ENVTEST_K8S_VERSION = 1.31.1
89

910
# Enable go modules and vendoring
1011
# https://github.com/golang/go/wiki/Modules#how-to-install-and-activate-module-support
@@ -55,7 +56,6 @@ endif
5556
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
5657
ENVTEST = go run ${PROJECT_DIR}/vendor/sigs.k8s.io/controller-runtime/tools/setup-envtest
5758
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
58-
ENVTEST_K8S_VERSION = 1.29.1
5959

6060
.PHONY: vendor
6161
vendor:
@@ -103,8 +103,7 @@ test-sec:
103103
test: unit
104104

105105
unit:
106-
# GCS bucket support will be going away, but explicitly enable it to use our own bucket.
107-
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --use-deprecated-gcs=true -p path --bin-dir $(PROJECT_DIR)/bin --remote-bucket openshift-kubebuilder-tools)" ./hack/ci-test.sh
106+
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path --bin-dir $(PROJECT_DIR)/bin --index https://raw.githubusercontent.com/openshift/api/master/envtest-releases.yaml)" ./hack/ci-test.sh
108107

109108
.PHONY: image
110109
image: ## Build docker image

0 commit comments

Comments
 (0)