Skip to content

🌱 Enhancements to how controller-gen is invoked #1911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 27, 2024
Merged

🌱 Enhancements to how controller-gen is invoked #1911

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ba8082
Allow running individual generate targets
mdbooth Feb 26, 2024
4bb8966
conversion-gen: Fix package name generation
mdbooth Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,25 +245,28 @@ modules: ## Runs go mod to ensure proper vendoring.
cd $(TOOLS_DIR); go mod tidy

.PHONY: generate
generate: ## Generate code
$(MAKE) generate-go
$(MAKE) generate-manifests
generate: generate-controller-gen generate-conversion-gen generate-go generate-manifests ## Generate all generated code

.PHONY: generate-go
generate-go: $(MOCKGEN)
$(MAKE) -B $(CONTROLLER_GEN) $(CONVERSION_GEN)
go generate ./...

.PHONY: generate-controller-gen
generate-controller-gen: $(CONTROLLER_GEN)
$(CONTROLLER_GEN) \
paths=./api/... \
object:headerFile=./hack/boilerplate/boilerplate.generatego.txt

.PHONY: generate-conversion-gen
capo_module := sigs.k8s.io/cluster-api-provider-openstack
generate-conversion-gen: $(CONVERSION_GEN)
$(CONVERSION_GEN) \
--input-dirs=./api/v1alpha1 \
--input-dirs=./api/v1alpha5 \
--input-dirs=./api/v1alpha6 \
--input-dirs=./api/v1alpha7 \
--input-dirs=./api/v1beta1 \
--input-dirs=$(capo_module)/api/v1alpha5 \
--input-dirs=$(capo_module)/api/v1alpha6 \
--input-dirs=$(capo_module)/api/v1alpha7 \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why v1beta1 is missing but I won't block you on that, maybe there is a reason behind.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, it's deliberately excluded because we don't need to generate conversions for v1beta1 (or v1alpha1).

--output-file-base=zz_generated.conversion \
--trim-path-prefix=$(capo_module)/ \
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
go generate ./...

.PHONY: generate-manifests
generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
Expand Down