Skip to content

Commit d9813b6

Browse files
committed
Fixup
1 parent 9125014 commit d9813b6

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -158,13 +158,14 @@ config/.flag.mk: $(CONTROLLER_GEN) $(MANIFEST_GEN_INPUTS)
158158
$(CONTROLLER_GEN) crd:crdVersions=v1 rbac:roleName=manager-role webhook paths="{./api/...,./controllers/...}" output:crd:artifacts:config=config/crd/bases
159159
@touch config/.flag.mk
160160

161-
CONVERSION_GEN_TARGET=$(shell find api -type d -name "v*1" -exec echo {}\/zz_generated.conversion.go \;)
162161
.PHONY: generate-conversion
163162
generate-conversion: $(CONVERSION_GEN) ## Generate code to convert api/v1beta1 and api/v1beta2 to api/v1beta3
164163
$(CONVERSION_GEN) \
165164
--input-dirs=./api/v1beta1 \
165+
--go-header-file=./hack/boilerplate.go.txt \
166+
--output-base=. --output-file-base=zz_generated.conversion
167+
$(CONVERSION_GEN) \
166168
--input-dirs=./api/v1beta2 \
167-
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
168169
--go-header-file=./hack/boilerplate.go.txt \
169170
--output-base=. --output-file-base=zz_generated.conversion
170171

api/v1beta1/zz_generated.conversion.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v1beta2/zz_generated.conversion.go

+9-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)