Skip to content

Commit 7c94dba

Browse files
committed
Replace override rules by GEN_OVERRIDE flag
1 parent fc15930 commit 7c94dba

File tree

1 file changed

+12
-16
lines changed

1 file changed

+12
-16
lines changed

Makefile

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,14 @@ 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
221+
214222
.DEFAULT_GOAL := help
215223
.PHONY: help
216224
help: ## Show this help screen
@@ -875,12 +883,7 @@ tools/scaffolder/bin/scaffolder:
875883
gen-crds: tools/openapi2crd/bin/openapi2crd
876884
@echo "==> Generating CRDs..."
877885
$(OPENAPI2CRD) --config config/openapi2crd.yaml \
878-
--output $(realpath .)/config/generated/crd/bases/crds.yaml
879-
880-
gen-crds-override: tools/openapi2crd/bin/openapi2crd
881-
@echo "==> Generating CRDs..."
882-
$(OPENAPI2CRD) --config config/openapi2crd.yaml \
883-
--output $(realpath .)/config/generated/crd/bases/crds.yaml --force
886+
--output $(realpath .)/config/generated/crd/bases/crds.yaml $(OPENAPI2CRD_OVERRIDE)
884887

885888
gen-go-types:
886889
@echo "==> Generating Go models from CRDs..."
@@ -890,18 +893,11 @@ gen-go-types:
890893
run-scaffolder: tools/scaffolder/bin/scaffolder
891894
@echo "==> Generating Go controller scaffolding and indexers..."
892895
$(SCAFFOLDER) --input $(realpath .)/config/generated/crd/bases/crds.yaml \
893-
--all --indexer-out $(realpath .)/internal/generated/indexer \
894-
--controller-out $(realpath .)/internal/generated/controller
895-
896-
run-scaffolder-override: tools/scaffolder/bin/scaffolder
897-
@echo "==> Generating Go controller scaffolding and indexers..."
898-
$(SCAFFOLDER) --input $(realpath .)/config/generated/crd/bases/crds.yaml \
899-
--all --override --indexer-out $(realpath .)/internal/generated/indexer \
896+
--all $(SCAFFOLDER_OVERRIDE) \
897+
--indexer-out $(realpath .)/internal/generated/indexer \
900898
--controller-out $(realpath .)/internal/generated/controller
901899

902900
gen-all: gen-crds gen-go-types run-scaffolder
903901

904-
gen-all-override: gen-crds-override gen-go-types run-scaffolder-override
905-
906902
build-autogen: gen-all $(ALL_IN_ONE_AUTOGENERATED_CONFIG)
907-
EXPERIMENTAL=1 VERSION=$(shell $(JQ) -r .next $(VERSION_FILE))-EXPERIMENTAL-${GITCOMMIT} $(MAKE) image
903+
EXPERIMENTAL=1 VERSION=$(shell $(JQ) -r .next $(VERSION_FILE))-EXPERIMENTAL-${GITCOMMIT} $(MAKE) image

0 commit comments

Comments
 (0)