Skip to content

Commit aa9c4b6

Browse files
authored
Merge pull request #3500 from LucaLanziani/fix/generate-go-apis-target
🐛 Fix/generate go apis target
2 parents a3b058a + 6971227 commit aa9c4b6

File tree

3 files changed

+218
-105
lines changed

3 files changed

+218
-105
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ TOOLS_BIN_DIR := $(TOOLS_DIR)/bin
2727
GO_INSTALL := ./scripts/go_install.sh
2828

2929
API_DIRS := cmd/clusterawsadm/api api exp/api controlplane/eks/api bootstrap/eks/api iam/api
30-
API_SRCS := $(foreach dir, $(API_DIRS), $(call rwildcard,../../$(dir),*.go))
30+
API_FILES := $(foreach dir, $(API_DIRS), $(call rwildcard,$(dir),*.go))
3131

3232
BIN_DIR := bin
3333
REPO_ROOT := $(shell git rev-parse --show-toplevel)
@@ -187,7 +187,7 @@ generate: ## Generate code
187187
$(MAKE) generate-go
188188
$(MAKE) $(CRD_DOCS)
189189

190-
$(CRD_DOCS_DIR)/%: $(API_SRCS)
190+
$(CRD_DOCS_DIR)/%: $(API_FILES)
191191
$(MAKE) -C docs/book src/crd/$*
192192

193193
.PHONY: generate-go ## Generate all Go api files
@@ -202,7 +202,7 @@ generate-go-apis: ## Alias for .build/generate-go-apis
202202
.build: ## Create the .build folder
203203
mkdir -p .build
204204

205-
.build/generate-go-apis: .build $(API_SRCS) $(CONTROLLER_GEN) $(DEFAULTER_GEN) $(CONVERSION_GEN) ## Generate all Go api files
205+
.build/generate-go-apis: .build $(API_FILES) $(CONTROLLER_GEN) $(DEFAULTER_GEN) $(CONVERSION_GEN) ## Generate all Go api files
206206
$(CONTROLLER_GEN) \
207207
paths=./api/... \
208208
paths=./$(EXP_DIR)/api/... \

docs/book/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ src/crd:
3939
mkdir -p src/crd
4040

4141
src/crd/index.md: $(API_FILTERED_SRCS) src/crd
42-
$(MAKE) gen_crd_docs API_DIR="../.." OUT_FILE=$@
42+
$(MAKE) gen_crd_docs API_DIR="$(shell go list -m)" OUT_FILE=$@
4343

4444
.PHONY: gen_crd_docs
4545
gen_crd_docs: $(GENCRDAPIREFERENCEDOCS) src/crd $(GENCRDAPIREFERENCEDOCS_SRCS)

0 commit comments

Comments
 (0)