Merge pull request #6815 from schrej/fix-make-generate-gopath

🐛 fix running make generate outside of GOPATH

Author: k8s-ci-robot

.gitignore

@@ -80,3 +80,7 @@ _releasenotes
 
 # Helm
 .helm
+
+# Used during parts of the build process. Files _should_ get cleaned up automatically.
+# This is also a good location for any temporary manfiests used during development
+tmp

Makefile

@@ -65,6 +65,7 @@ export PATH := $(abspath $(TOOLS_BIN_DIR)):$(PATH)
 # Set --output-base for conversion-gen if we are not within GOPATH
 ifneq ($(abspath $(ROOT_DIR)),$(shell go env GOPATH)/src/sigs.k8s.io/cluster-api)
 	CONVERSION_GEN_OUTPUT_BASE := --output-base=$(ROOT_DIR)
+	CONVERSION_GEN_OUTPUT_BASE_CAPD := --output-base=$(ROOT_DIR)/$(CAPD_DIR)
 else
 	export GOPATH := $(shell go env GOPATH)
 endif
@@ -403,20 +404,23 @@ generate-go-conversions-capd: $(CONVERSION_GEN) ## Generate conversions go code
 		--build-tag=ignore_autogenerated_capd \
 		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha3 \
 		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha4 \
-		--output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \
+		--output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE_CAPD) \
 		--go-header-file=../../../hack/boilerplate/boilerplate.generatego.txt
 
+# The tmp/sigs.k8s.io/cluster-api symlink is a workaround to make this target run outside of GOPATH
 .PHONY: generate-go-openapi
 generate-go-openapi: $(OPENAPI_GEN) $(CONTROLLER_GEN) ## Generate openapi go code for runtime SDK
-	@for pkg in "api/v1beta1" "$(EXP_DIR)/runtime/hooks/api/v1alpha1"; do \
+	@mkdir -p ./tmp/sigs.k8s.io; ln -s $(ROOT_DIR) ./tmp/sigs.k8s.io/; cd ./tmp; \
+	for pkg in "api/v1beta1" "$(EXP_DIR)/runtime/hooks/api/v1alpha1"; do \
 		$(MAKE) clean-generated-openapi-definitions SRC_DIRS="./$${pkg}"; \
 		echo "** Generating openapi schema for types in ./$${pkg} **"; \
 		$(OPENAPI_GEN) \
-			--input-dirs=./$${pkg} \
+			--input-dirs=sigs.k8s.io/cluster-api/$${pkg} \
 			--output-file-base=zz_generated.openapi \
 			--output-package=sigs.k8s.io/cluster-api/$${pkg} \
-			--go-header-file=./hack/boilerplate/boilerplate.generatego.txt; \
-	done
+			--go-header-file=../hack/boilerplate/boilerplate.generatego.txt; \
+	done; \
+	rm sigs.k8s.io/cluster-api
 
 .PHONY: generate-modules
 generate-modules: ## Run go mod tidy to ensure modules are up to date