Skip to content

Commit 2999b17

Browse files
authored
Merge pull request #3450 from Ankitasw/revert-3344-fix/generate-go-apis-target
Revert ":bug: ./build/generate-go-apis to run on api change"
2 parents 5ffa9bc + 19cfd7e commit 2999b17

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
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_FILES := $(foreach dir, $(API_DIRS), $(call rwildcard,$(dir),*.go))
30+
API_SRCS := $(foreach dir, $(API_DIRS), $(call rwildcard,../../$(dir),*.go))
3131

3232
BIN_DIR := bin
3333
REPO_ROOT := $(shell git rev-parse --show-toplevel)
@@ -192,7 +192,7 @@ generate: ## Generate code
192192
$(MAKE) generate-go
193193
$(MAKE) $(CRD_DOCS)
194194

195-
$(CRD_DOCS_DIR)/%: $(API_FILES)
195+
$(CRD_DOCS_DIR)/%: $(API_SRCS)
196196
$(MAKE) -C docs/book src/crd/$*
197197

198198
.PHONY: generate-go ## Generate all Go api files
@@ -207,7 +207,7 @@ generate-go-apis: ## Alias for .build/generate-go-apis
207207
.build: ## Create the .build folder
208208
mkdir -p .build
209209

210-
.build/generate-go-apis: .build $(API_FILES) $(CONTROLLER_GEN) $(DEFAULTER_GEN) $(CONVERSION_GEN) ## Generate all Go api files
210+
.build/generate-go-apis: .build $(API_SRCS) $(CONTROLLER_GEN) $(DEFAULTER_GEN) $(CONVERSION_GEN) ## Generate all Go api files
211211
$(CONTROLLER_GEN) \
212212
paths=./api/... \
213213
paths=./$(EXP_DIR)/api/... \

docs/book/src/crd/index.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16093,8 +16093,8 @@ AWSMachineTemplateResource
1609316093
(<em>Appears on:</em><a href="#infrastructure.cluster.x-k8s.io/v1beta1.AWSMachineSpec">AWSMachineSpec</a>)
1609416094
</p>
1609516095
<p>
16096-
<p>AWSResourceReference is a reference to a specific AWS resource by ID or filters.
16097-
Only one of ID or Filters may be specified. Specifying more than one will result in
16096+
<p>AWSResourceReference is a reference to a specific AWS resource by ID, ARN, or filters.
16097+
Only one of ID, ARN or Filters may be specified. Specifying more than one will result in
1609816098
a validation error.</p>
1609916099
</p>
1610016100
<table>
@@ -16126,8 +16126,7 @@ string
1612616126
</td>
1612716127
<td>
1612816128
<em>(Optional)</em>
16129-
<p>ARN of resource.
16130-
Deprecated: This field has no function and is going to be removed in the next release.</p>
16129+
<p>ARN of resource</p>
1613116130
</td>
1613216131
</tr>
1613316132
<tr>

0 commit comments

Comments
 (0)