Skip to content

Commit 0a24d10

Browse files
Makefile: Removed override flag for openapi2crd (#2947)
* CLOUDP-358677: Remove crapi internal schema validation (#2948) Signed-off-by: jose.vazquez <[email protected]> * Removed --all flag as a default for Scaffolder --------- Signed-off-by: jose.vazquez <[email protected]> Co-authored-by: josvaz <[email protected]>
1 parent a080ed4 commit 0a24d10

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

Makefile

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -211,13 +211,7 @@ CRD2GO := go tool -modfile=tools/toolbox/go.mod crd2go
211211
OPENAPI2CRD := tools/openapi2crd/bin/openapi2crd
212212
SCAFFOLDER := tools/scaffolder/bin/scaffolder
213213

214-
ifdef GEN_OVERRIDE
215-
OPENAPI2CRD_OVERRIDE := --force
216-
SCAFFOLDER_OVERRIDE := --override
217-
else
218-
OPENAPI2CRD_OVERRIDE :=
219-
SCAFFOLDER_OVERRIDE :=
220-
endif
214+
SCAFFOLDER_FLAGS ?= --all
221215

222216
.DEFAULT_GOAL := help
223217
.PHONY: help
@@ -885,19 +879,21 @@ gen-crds: tools/openapi2crd/bin/openapi2crd
885879
@echo "==> Generating CRDs..."
886880
$(MAKE) -C tools/openapi2crd build
887881
$(OPENAPI2CRD) --config config/openapi2crd.yaml \
888-
--output $(realpath .)/config/generated/crd/bases/crds.yaml $(OPENAPI2CRD_OVERRIDE)
882+
--output $(realpath .)/config/generated/crd/bases/crds.yaml
889883
cp $(realpath .)/config/generated/crd/bases/crds.yaml $(realpath .)/internal/generated/crds/crds.yaml
890884

891885
gen-go-types:
892886
@echo "==> Generating Go models from CRDs..."
893887
$(CRD2GO) --input $(realpath .)/config/generated/crd/bases/crds.yaml \
894888
--output $(realpath .)/internal/nextapi/generated/v1
895889

890+
# In order to override all of the generated versioned handler, use SCAFFOLDER_FLAGS="--all --override" make gen-all
891+
# In order to override a specific generated versioned handler for the Group CRD, use SCAFFOLDER_FLAGS="--kind=Group --override" make gen-all
896892
run-scaffolder: tools/scaffolder/bin/scaffolder
897893
@echo "==> Generating Go controller scaffolding and indexers..."
898894
$(MAKE) -C tools/scaffolder build
899895
$(SCAFFOLDER) --input $(realpath .)/config/generated/crd/bases/crds.yaml \
900-
--all $(SCAFFOLDER_OVERRIDE) \
896+
$(SCAFFOLDER_FLAGS) \
901897
--indexer-out $(realpath .)/internal/generated/indexers \
902898
--controller-out $(realpath .)/internal/generated/controller
903899

0 commit comments

Comments
 (0)