From da7a19607903ed9298645085761010d70a7fd2a0 Mon Sep 17 00:00:00 2001 From: Rafaela Soares Date: Tue, 6 May 2025 08:55:26 +0100 Subject: [PATCH 1/2] clean --- make/generate.mk | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/make/generate.mk b/make/generate.mk index 0a9381cc..c5cfe6d3 100644 --- a/make/generate.mk +++ b/make/generate.mk @@ -10,17 +10,6 @@ MEMBER_CLUSTER_CRDS:=useraccounts nstemplatesets memberstatuses idlers toolchain PATH_TO_CRD_BASES=config/crd/bases PROJECT_DIR := $(shell pwd) -# openapi-gen requires the GOPATH env var be set and the codebase be present within it. -# Let's not require $GOPATH be set up in the user's environment and the checkout be -# placed in it. -# Instead, fake it locally. -FAKE_GOPATH=$(PROJECT_DIR)/.fake-gopath -# The root of all codeready-toolchain repos in the GOPATH -CRT_IN_GOPATH=$(FAKE_GOPATH)/src/github.com/codeready-toolchain -# This gives the GOPATH as understood by the go compiler even if the env var is not explicitly set. -# We use this to find the packages that are already downloaded locally to save on the network traffic -# when persuading openapi-gen that our codebase is checked out under the GOPATH. -LOCAL_GOPATH=`$(GO) env GOPATH` .PHONY: generate ## Generate deepcopy, openapi and CRD files after the API was modified From 6e37673c93a09d1069b44d3234016d8757b5787c Mon Sep 17 00:00:00 2001 From: Rafaela Soares Date: Tue, 6 May 2025 10:02:12 +0100 Subject: [PATCH 2/2] fix --- make/generate.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/generate.mk b/make/generate.mk index c5cfe6d3..0c1b53ae 100644 --- a/make/generate.mk +++ b/make/generate.mk @@ -29,7 +29,7 @@ gen-crd-ref-docs: crd-ref-docs .PHONY: generate-openapi generate-openapi: openapi-gen @echo "re-generating the openapi go file..." - $(OPENAPI_GEN) ./api/$(API_VERSION)/ \ + $(OPENAPI_GEN) ./api/$(API_VERSION)/ \ --output-pkg github.com/codeready-toolchain/api/api/$(API_VERSION) \ --output-file zz_generated.openapi.go \ --output-dir ./api/$(API_VERSION) \