🌱 Enhancements to how controller-gen is invoked #1911
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
generate-controller-gen and generate-conversion-gen targets are split out of generate-go
When conversion-gen has to generate a dependency between 2 input packages it uses the value passed to --input-dirs as the package name in the generated import. This does not work if that value is a directory name. If you specify a package name here instead it works correctly. We also stop trying to generate conversions for versions which don't need them.
k8s-ci-robot
added
cncf-cla: yes
k8s-ci-robot
added
the
size/S
✅ Deploy Preview for kubernetes-sigs-cluster-api-openstack ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
EmilienM
reviewed
Feb 27, 2024
| --input-dirs=./api/v1beta1 \ | ||
| --input-dirs=$(capo_module)/api/v1alpha5 \ | ||
| --input-dirs=$(capo_module)/api/v1alpha6 \ | ||
| --input-dirs=$(capo_module)/api/v1alpha7 \ |
There was a problem hiding this comment.
I'm not sure why v1beta1 is missing but I won't block you on that, maybe there is a reason behind.
There was a problem hiding this comment.
Yep, it's deliberately excluded because we don't need to generate conversions for v1beta1 (or v1alpha1).
EmilienM
approved these changes
Feb 27, 2024
k8s-ci-robot
added
the
do-not-merge/hold
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: EmilienM, mdbooth The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/hold cancel |
k8s-ci-robot
removed
the
do-not-merge/hold
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR includes 2 commits which each make a single change to how the Makefile does code generation.
The first adds the following 2 separate targets:
These invoke
controller-genandconversion-genrespectively. These were previously invoked by thegenerate-gotarget, but that target is now reduced to simply executinggo generate ./....The
generatetarget continues to invoke all code generation.The advantage of this is the ability to easily run only the generation you need during development.
The second commit changes the behaviour of
generate-conversion-gen. This produces no change in output against the current codebase, but fixes an issue generating an incorrect package internal package name should conversion-gen want to add a dependency between packages. I encountered this when I made a change which caused it to do this, which has not yet landed.