github/open-cluster-management
1
0
Fork 0
mirror of https://github.com/open-cluster-management-io/ocm.git synced 2026-02-14 10:00:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: replace broken kubebuilder-tools download with setup-envtest (#1390)

Browse Source 
🤖 Generated with [Claude Code](https://claude.ai/code)

Signed-off-by: Qing Hao <qhao@redhat.com>
Co-authored-by: Qing Hao <qhao@redhat.com>
Co-authored-by: Claude <noreply@anthropic.com>
This commit is contained in:
OpenShift Cherrypick Robot
2026-02-13 08:40:00 +01:00
committed by GitHub
parent 558d5cb405
commit 267e8cfe94
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/integration-test.mk
View File

@@ -3,23 +3,33 @@ TEST_TMP :=/tmp
export KUBEBUILDER_ASSETS ?=$(TEST_TMP)/kubebuilder/bin export KUBEBUILDER_ASSETS ?=$(TEST_TMP)/kubebuilder/bin
K8S_VERSION ?=1.30.0 K8S_VERSION ?=1.30.0
KB_TOOLS_ARCHIVE_NAME :=kubebuilder-tools-$(K8S_VERSION)-$(GOHOSTOS)-$(GOHOSTARCH).tar.gz SETUP_ENVTEST := $(shell go env GOPATH)/bin/setup-envtest
KB_TOOLS_ARCHIVE_PATH := $(TEST_TMP)/$(KB_TOOLS_ARCHIVE_NAME)
# download the kubebuilder-tools to get kube-apiserver binaries from it # download the kubebuilder-tools to get kube-apiserver binaries from it
ensure-kubebuilder-tools: ensure-kubebuilder-tools:
ifeq "" "$(wildcard $(KUBEBUILDER_ASSETS))" ifeq "" "$(wildcard $(KUBEBUILDER_ASSETS))"
$(info Downloading kube-apiserver into '$(KUBEBUILDER_ASSETS)') $(info Downloading kube-apiserver into '$(KUBEBUILDER_ASSETS)')
mkdir -p '$(KUBEBUILDER_ASSETS)' mkdir -p '$(KUBEBUILDER_ASSETS)'
curl -s -f -L https://storage.googleapis.com/kubebuilder-tools/$(KB_TOOLS_ARCHIVE_NAME) -o '$(KB_TOOLS_ARCHIVE_PATH)' ifeq "" "$(wildcard $(SETUP_ENVTEST))"
tar -C '$(KUBEBUILDER_ASSETS)' --strip-components=2 -zvxf '$(KB_TOOLS_ARCHIVE_PATH)' $(info Installing setup-envtest into '$(SETUP_ENVTEST)')
go install sigs.k8s.io/controller-runtime/tools/setup-envtest@release-0.22
endif
ENVTEST_K8S_PATH=$$($(SETUP_ENVTEST) use $(K8S_VERSION) --bin-dir $(KUBEBUILDER_ASSETS) -p path); \
if [ -z "$$ENVTEST_K8S_PATH" ]; then \
echo "Error: setup-envtest returned empty path"; \
exit 1; \
fi; \
if [ ! -d "$$ENVTEST_K8S_PATH" ]; then \
echo "Error: setup-envtest path does not exist: $$ENVTEST_K8S_PATH"; \
exit 1; \
fi; \
cp -r $$ENVTEST_K8S_PATH/* $(KUBEBUILDER_ASSETS)/
else else
$(info Using existing kube-apiserver from "$(KUBEBUILDER_ASSETS)") $(info Using existing kube-apiserver from "$(KUBEBUILDER_ASSETS)")
endif endif
.PHONY: ensure-kubebuilder-tools .PHONY: ensure-kubebuilder-tools
clean-integration-test: clean-integration-test:
$(RM) '$(KB_TOOLS_ARCHIVE_PATH)'
rm -rf $(TEST_TMP)/kubebuilder rm -rf $(TEST_TMP)/kubebuilder
$(RM) ./*integration.test $(RM) ./*integration.test
.PHONY: clean-integration-test .PHONY: clean-integration-test